[meta-intel] [PATCH 2/3] gma500-gfx-check: remove

Anuj Mittal anuj.mittal at intel.com
Tue Oct 29 20:49:51 PDT 2019


This is a check to avoid loading gma500 module on certain older hardware
using 32 bit BSP where gma was claiming ownership of graphics when it
shouldn't have.

The platforms for which this was added aren't supported anymore so
remove.

Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
---
 conf/include/maintainers.inc                   |  1 -
 conf/machine/intel-core2-32.conf               |  2 --
 .../gma500-gfx-check/gma500-gfx-check.conf     |  2 --
 .../gma500-gfx-check/gma500-gfx-check.sh       | 15 ---------------
 .../gma500-gfx-check/gma500-gfx-check_1.0.bb   | 18 ------------------
 5 files changed, 38 deletions(-)
 delete mode 100644 recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
 delete mode 100644 recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
 delete mode 100644 recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb

diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index d3ec4792..e5ed9859 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -2,7 +2,6 @@
 
 RECIPE_MAINTAINER_pn-core-image-rt = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-core-image-rt-sdk = "Anuj Mittal <anuj.mittal at intel.com>"
-RECIPE_MAINTAINER_pn-gma500-gfx-check = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-gmmlib = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-intel-gpu-tools = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-intel-media-driver = "Anuj Mittal <anuj.mittal at intel.com>"
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index d99dc783..20c98726 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -13,8 +13,6 @@ MACHINE_FEATURES += "intel-ucode"
 
 MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
-
 # Enable optional QAT items:
 COMPATIBLE_MACHINE_pn-qat17 = "intel-core2-32"
 
diff --git a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf b/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
deleted file mode 100644
index 74d33c87..00000000
--- a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Mimic modprobe's install funcitonality with busybox's modprobe
-install gma500_gfx dmesg | grep gma500_gfx_checked || { /etc/modprobe.d/gma500-gfx-check.sh || modprobe gma500_gfx; }
diff --git a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh b/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
deleted file mode 100644
index 75cda99f..00000000
--- a/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Check for devices we wish to avoid gma500_gfx for
-DEVICES="0x8119 0x4108"
-
-# Checked flag to avoid infinite modprobe
-echo "gma500_gfx_checked" >> /dev/kmsg;
-
-for DEVICE in $DEVICES; do
-    if udevadm trigger --subsystem-match=pci --verbose --attr-match=device=$DEVICE | grep "pci" >> /dev/null ; then
-        echo "Found $DEVICE, avoiding gma500_gfx module" >> /dev/kmsg;
-        exit 0
-    fi
-done
-exit 1
diff --git a/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb b/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
deleted file mode 100644
index 7b08064b..00000000
--- a/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Intel gma500_gfx fix for certain hardware"
-DESCRIPTION = "Avoid inserting gma500_gfx module for certain hardware devices."
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI = "file://gma500-gfx-check.conf \
-	file://gma500-gfx-check.sh "
-
-do_install(){
-    install -d ${D}${sysconfdir}/modprobe.d/
-    install -m 755 ${WORKDIR}/gma500-gfx-check.sh ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.sh
-    install -m 644 ${WORKDIR}/gma500-gfx-check.conf ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.conf
-}
-
-FILES_${PN}="${sysconfdir}/modprobe.d/gma500-gfx-check.conf \
-             ${sysconfdir}/modprobe.d/gma500-gfx-check.sh"
-
-COMPATIBLE_MACHINE = "intel-core2-32"
-- 
2.21.0



More information about the meta-intel mailing list