gma500-gfx-check: Fixes infinite calling to modprobe gma500_gfx

The previous script caused an infinite call to modprobe gma500_gfx on certain
situations, this fixes a typo and uses a new flag to avoid the infinite loop

Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
index 69f109e5fc75baf8c47e0ea443e38fec610ff2f8..74d33c871fba4abe7ef10b0cc9e007f1fc70c8fe 100644 (file)
--- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
+++ b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
@@ -1,2 +1,2 @@
 # Mimic modprobe's install funcitonality with busybox's modprobe
-install gma500_gfx lsmod | grep gma || { gma500_gfx_check.sh || modprobe gma500_gfx; }
+install gma500_gfx dmesg | grep gma500_gfx_checked || { /etc/modprobe.d/gma500-gfx-check.sh || modprobe gma500_gfx; }

diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
index 0c7b3aa14f3727f4a7c4f7989263869588c616ea..75cda99f547a004388c6486d0a8e05fd140d1116 100644 (file)
--- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
+++ b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
@@ -2,6 +2,10 @@
 
 # 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;