omap3-sgx-modules: add patch from Steve Sakoman to fix build against kernel 3.0

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 40 insertions, 1 deletions

diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch
new file mode 100644
index 00000000..957a1547
--- /dev/null
+++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch
@@ -0,0 +1,38 @@
+From: Steve Sakoman

+Subject: omap3-sgx-modules: Fix build for Linux 3.0

+

+This patch implements the header change from plat/display.h to video/omapdss.h

+

+Signed-off-by: Steve Sakoman <steve@sakoman.com>

+

+--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig      2011-08-01 07:21:45.000000000 -0700

++++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c   2011-08-01 07:29:32.000000000 -0700

+@@ -47,12 +47,12 @@

+ #if defined (SUPPORT_TI_DSS_FW)

+ #include <asm/io.h>

+ 

+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))

+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))

++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)))

++#include <video/omapdss.h>

++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))

+ #include <plat/display.h>

+-#else 

++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))

+ #include <mach/display.h>

+-#endif 

+ #else 

+ #include <asm/arch-omap/display.h>

+ #endif 

+@@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign

+ extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);

+ extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);

+ #else

++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))

++#include <video/omapdss.h>

++#else

+ #include <plat/display.h>

++#endif

+ #include <linux/console.h>

+ #include <linux/fb.h>

+ static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;
\ No newline at end of file
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb
index ae5f2772..6e49366b 100644
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb
+++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.6.16.3977.bb
@@ -11,10 +11,11 @@ BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin"
 
 inherit module
 
-MACHINE_KERNEL_PR_append = "j"
+MACHINE_KERNEL_PR_append = "k"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \
            file://Compile-fixes-for-38-kernel.patch \
+           file://kernel-30.patch \
           "
 SRC_URI[md5sum] = "ff8c1f2b8e4cb42f4ced6a613b081ada"
 SRC_URI[sha256sum] = "cdb0bd3964e107733d632aa8224e0537b05c1ffac34befc036423458c8d75255"