omap3-sgx-modules: remove unnecessary patches for x11, cleanup old patch
authorDenys Dmytriyenko <denys@ti.com>
Fri, 21 Jun 2013 18:50:15 +0000 (14:50 -0400)
committerDenys Dmytriyenko <denys@ti.com>
Fri, 21 Jun 2013 18:50:15 +0000 (14:50 -0400)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch [deleted file]
recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch [deleted file]
recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch

diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch
deleted file mode 100644 (file)
index fc315bc..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c-orig      2011-03-08 04:27:35.000000000 -0800
-+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c   2011-03-17 13:11:31.000000000 -0700
-@@ -235,9 +235,20 @@ static OMAP_ERROR UnblankDisplay(OMAPLFB
- {
-       int res;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+      console_lock();
-+#else
-       acquire_console_sem();
-+#endif
-+
-       res = fb_blank(psDevInfo->psLINFBInfo, 0);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+      console_unlock();
-+#else
-       release_console_sem();
-+#endif
-+
- #if !defined (CONFIG_OMAP2_DSS)
-       if (res != 0 && res != -EINVAL)
-       {
-@@ -1118,7 +1129,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
-       OMAP_ERROR eError = OMAP_ERROR_GENERIC;
-       unsigned long FBSize;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+      console_lock();
-+#else
-       acquire_console_sem();
-+#endif
-       if (fb_idx < 0 || fb_idx >= num_registered_fb)
-       {
-@@ -1254,7 +1269,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
- errModPut:
-       module_put(psLINFBOwner);
- errRelSem:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+      console_unlock();
-+#else
-       release_console_sem();
-+#endif
-       return eError;
- }
-@@ -1263,7 +1282,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
-       struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo;
-       struct module *psLINFBOwner;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+      console_lock();
-+#else
-       acquire_console_sem();
-+#endif
-       psLINFBOwner = psLINFBInfo->fbops->owner;
-@@ -1274,7 +1297,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
-       module_put(psLINFBOwner);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
-+      console_unlock();
-+#else
-       release_console_sem();
-+#endif
- }
- OMAP_ERROR OMAPLFBInit(void)
---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig     2011-03-08 04:27:35.000000000 -0800
-+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c  2011-03-17 13:40:15.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <linux/module.h>
- #include <linux/pci.h>
---- GFX_Linux_KM/services4/srvkm/common/resman.c-orig  2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/common/resman.c       2011-03-17 14:20:07.000000000 -0700
-@@ -24,15 +24,17 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
- #include "services_headers.h"
- #include "resman.h"
- #ifdef __linux__
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <linux/sched.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
- #include <linux/hardirq.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig    2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-17 14:33:09.000000000 -0700
-@@ -24,9 +24,13 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- #include <asm/io.h>
- #include <asm/uaccess.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h-orig  2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h       2011-03-17 14:39:14.000000000 -0700
-@@ -27,11 +27,14 @@
- #ifndef __PVR_UACCESS_H__
- #define __PVR_UACCESS_H__
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <asm/uaccess.h>
- static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes)
---- GFX_Linux_KM/services4/srvkm/env/linux/mm.c-orig   2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.c        2011-03-17 14:46:23.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <linux/mm.h>
- #include <linux/vmalloc.h>
- #include <asm/io.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/mutils.h-orig       2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.h    2011-03-17 14:54:37.000000000 -0700
-@@ -27,11 +27,13 @@
- #ifndef __IMG_LINUX_MUTILS_H__
- #define __IMG_LINUX_MUTILS_H__
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
- #endif
--
--#include <linux/version.h>
-+#endif
- #if !(defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)))
- #if defined(SUPPORT_LINUX_X86_PAT)
---- GFX_Linux_KM/services4/srvkm/env/linux/mm.h-orig   2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.h        2011-03-17 15:33:56.000000000 -0700
-@@ -27,11 +27,14 @@
- #ifndef __IMG_LINUX_MM_H__
- #define __IMG_LINUX_MM_H__
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <linux/slab.h>
- #include <linux/mm.h>
- #include <linux/list.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/mmap.c-orig 2011-03-17 20:39:31.000000000 -0700
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mmap.c      2011-03-17 20:40:00.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/vmalloc.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/proc.c-orig 2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/proc.c      2011-03-17 21:01:35.000000000 -0700
-@@ -24,13 +24,16 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- #include <linux/init.h>
- #include <linux/module.h>
--#include <linux/version.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <linux/seq_file.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/module.c-orig       2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/module.c    2011-03-17 21:32:19.000000000 -0700
-@@ -24,9 +24,13 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- #if !defined(SUPPORT_DRI_DRM)
-       
-@@ -44,7 +48,6 @@
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
--#include <linux/version.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/event.c-orig        2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/event.c     2011-03-18 08:51:42.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <asm/io.h>
- #include <asm/page.h>
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
---- GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c-orig       2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c    2011-03-18 08:58:16.000000000 -0700
-@@ -24,11 +24,14 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
--#include <linux/version.h>
- #include <asm/io.h>
- #include <asm/page.h>
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c-orig      2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c   2011-03-18 09:01:06.000000000 -0700
-@@ -26,14 +26,17 @@
- #if defined(SUPPORT_DRI_DRM)
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
-  #include <linux/config.h>
- #endif
-+#endif
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
--#include <linux/version.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
- #include <asm/ioctl.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/mutils.c-orig       2011-03-08 04:27:36.000000000 -0800
-+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.c    2011-03-18 09:08:12.000000000 -0700
-@@ -24,10 +24,13 @@
-  *
-  ******************************************************************************/
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
- #endif
--#include <linux/version.h>
-+#endif
- #include <linux/spinlock.h>
- #include <linux/mm.h>
---- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig    2011-03-31 13:46:48.000000000 -0700
-+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-31 15:14:10.000000000 -0700
-@@ -76,7 +76,8 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG
- static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ;
-  
--static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED;
-+static DEFINE_SPINLOCK(gsDebugLockIRQ);
-+
- #if !defined (USE_SPIN_LOCK)  
- #define       USE_SPIN_LOCK (in_interrupt() || !preemptible())
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch
deleted file mode 100644 (file)
index 269d459..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-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 at 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;
index 957a15473ba01cfb56c96a9efcaebfb18cea65c8..269d459ba3e1f0337fdb011919ee803be14bbeb3 100644 (file)
@@ -1,38 +1,38 @@
-From: Steve Sakoman\r
-Subject: omap3-sgx-modules: Fix build for Linux 3.0\r
-\r
-This patch implements the header change from plat/display.h to video/omapdss.h\r
-\r
-Signed-off-by: Steve Sakoman <steve@sakoman.com>\r
-\r
---- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig     2011-08-01 07:21:45.000000000 -0700\r
-+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c  2011-08-01 07:29:32.000000000 -0700\r
-@@ -47,12 +47,12 @@\r
- #if defined (SUPPORT_TI_DSS_FW)\r
- #include <asm/io.h>\r
\r
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))\r
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))\r
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)))\r
-+#include <video/omapdss.h>\r
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))\r
- #include <plat/display.h>\r
--#else \r
-+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))\r
- #include <mach/display.h>\r
--#endif \r
- #else \r
- #include <asm/arch-omap/display.h>\r
- #endif \r
-@@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign\r
- extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);\r
- extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);\r
- #else\r
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))\r
-+#include <video/omapdss.h>\r
-+#else\r
- #include <plat/display.h>\r
-+#endif\r
- #include <linux/console.h>\r
- #include <linux/fb.h>\r
- static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;
\ No newline at end of file
+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 at 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;