From d14da1e82b8724b30fa7d5e6598d3e2916493258 Mon Sep 17 00:00:00 2001 From: Hadrien Boutteville Date: Fri, 18 Jul 2014 18:46:36 +0200 Subject: [PATCH] ti-gfx: add patch to fix build failure with es5.x Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel, omap_dss_device's 'output' is renamed 'src'. Build with es5.x fails because ti-gfx still uses 'output'. Fix build with at least es5.x selected (AM35xx). Signed-off-by: Hadrien Boutteville Cc: Thomas Petazzoni Cc: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .../ti-gfx-0001-fix-build-omaplfb-linux.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch diff --git a/package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch b/package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch new file mode 100644 index 000000000..002d01c1a --- /dev/null +++ b/package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch @@ -0,0 +1,21 @@ +Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel, +omap_dss_device's 'output' is renamed 'src'. + +Fix build with at least es5.x selected (AM35xx). + +Signed-off-by: Hadrien Boutteville + +--- a/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c ++++ b/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c +@@ -176,8 +176,10 @@ + #define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL + #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)) + #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL +-#else ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)) + #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->output->manager : NULL ++#else ++#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->src->manager : NULL + #endif + + #define WAIT_FOR_VSYNC(man) ((man)->wait_for_vsync)