summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/powervr-drivers
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2016-04-25 23:56:27 +0000
committerDenys Dmytriyenko <denys@ti.com>2016-04-26 14:54:59 -0400
commit6dea1b68af73cc1c6bcf4c3f780ed6fcce770adb (patch)
tree6565e4ee1707efdfb95c13db21179d088cdb02d5 /recipes-bsp/powervr-drivers
parentc70102c671f120822edc7743401e821ea4f40e4f (diff)
downloadmeta-ti-6dea1b68af73cc1c6bcf4c3f780ed6fcce770adb.tar.gz
sgx: drop old outdated omap3-sgx-modules and libgles-omap3 recipes
Besides being outdated and deprecated in favor of new ti-sgx-ddk recipes (previously known as omapdrm-pvr and omap5-sgx-ddk), 3D graphics drivers are kernel specific and corresponding kernel versions (prior to 4.0) have all been dropped already. Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-bsp/powervr-drivers')
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0001-PoC-GFX-SDK-Make-5_01_01_01-work-against-3.14-LTS.patch52
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch121
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0003-SGX-displayclass-am335x-am437x-fix-mutex-deadlock-wa.patch153
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0004-SGX-linux-make-it-building-against-ti-linux-3.14.y.patch45
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb81
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch346
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch38
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb39
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb53
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb62
-rw-r--r--recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb58
11 files changed, 0 insertions, 1048 deletions
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0001-PoC-GFX-SDK-Make-5_01_01_01-work-against-3.14-LTS.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0001-PoC-GFX-SDK-Make-5_01_01_01-work-against-3.14-LTS.patch
deleted file mode 100644
index e5410798..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0001-PoC-GFX-SDK-Make-5_01_01_01-work-against-3.14-LTS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From e2db38959a70d1be604a297276a0b0c2ac219bf5 Mon Sep 17 00:00:00 2001
2From: Darren Etheridge <detheridge@ti.com>
3Date: Tue, 29 Jul 2014 16:06:17 -0500
4Subject: [PATCH 1/4] PoC: GFX: SDK: Make 5_01_01_01 work against 3.14 LTS
5
6An API rename is the main change. Also hacked in some function prototypes
7for enabling use of the tilcdc DRM driver instead of the fbdev driver on
8AM335x. However this all really needs a good cleanup as it is hacky at
9the moment.
10
11Signed-off-by: Darren Etheridge <detheridge@ti.com>
12---
13 GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c | 5 +++++
14 GFX_Linux_KM/services4/srvkm/env/linux/mutils.h | 6 +++++-
15 2 files changed, 10 insertions(+), 1 deletion(-)
16
17diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
18index 5c3fc48..3857b95 100644
19--- a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
20+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
21@@ -93,6 +93,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 #include <linux/mutex.h>
23
24 #include <video/da8xx-fb.h>
25+/* used by SGX OMAPLFB drvier */
26+typedef void (*vsync_callback_t)(void *arg);
27+int register_vsync_cb(vsync_callback_t handler, void *arg, int idx);
28+int unregister_vsync_cb(vsync_callback_t handler, void *arg, int idx);
29+
30 #if defined(PVR_OMAPLFB_DRM_FB)
31 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
32 #include <plat/display.h>
33diff --git a/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h b/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
34index 31e0dac..90ec41c 100644
35--- a/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
36+++ b/GFX_Linux_KM/services4/srvkm/env/linux/mutils.h
37@@ -79,7 +79,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
38 #define IOREMAP(pa, bytes) ioremap_cache(pa, bytes)
39 #else
40 #if defined(__arm__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
41- #define IOREMAP(pa, bytes) ioremap_cached(pa, bytes)
42+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
43+ #define IOREMAP(pa, bytes) ioremap_cache(pa, bytes)
44+ #else
45+ #define IOREMAP(pa, bytes) ioremap_cached(pa, bytes)
46+ #endif
47 #else
48 #define IOREMAP(pa, bytes) ioremap(pa, bytes)
49 #endif
50--
511.9.1
52
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch
deleted file mode 100644
index 5a8d1f1e..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch
+++ /dev/null
@@ -1,121 +0,0 @@
1From 7886ef77e4b48a7edd14acbcbe48f6a898251e78 Mon Sep 17 00:00:00 2001
2From: Darren Etheridge <detheridge@ti.com>
3Date: Fri, 25 Jul 2014 16:03:14 -0500
4Subject: [PATCH 2/5] SGX: linux: use platform data to provide reset info
5
6In ti-linux-3.14.y we will not have a reset driver unlike ti-linux-3.12.y
7so this commit removes the dependency on the reset driver and instead
8uses the platform data that in a dt environment is configured in
9mach-omap2/pdata-quirks.c
10
11Signed-off-by: Darren Etheridge <detheridge@ti.com>
12---
13 GFX_Linux_KM/services4/srvkm/env/linux/module.c | 34 ++++++++++++++++++++-----
14 1 file changed, 28 insertions(+), 6 deletions(-)
15
16diff --git a/GFX_Linux_KM/services4/srvkm/env/linux/module.c b/GFX_Linux_KM/services4/srvkm/env/linux/module.c
17index e03dc00..90e16ce 100644
18--- a/GFX_Linux_KM/services4/srvkm/env/linux/module.c
19+++ b/GFX_Linux_KM/services4/srvkm/env/linux/module.c
20@@ -47,6 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21 #endif
22 #endif
23
24+#ifndef CONFIG_RESET_CONTROLLER
25+#include <linux/platform_data/sgx-omap.h>
26+#endif
27+
28 #if defined(SUPPORT_DRI_DRM) && !defined(SUPPORT_DRI_DRM_PLUGIN)
29 #define PVR_MOD_STATIC
30 #else
31@@ -344,9 +348,11 @@ static LDM_DRV powervr_driver = {
32 LDM_DEV *gpsPVRLDMDev;
33
34 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
35+#ifdef CONFIG_RESET_CONTROLLER
36 struct reset_control *rstc;
37 bool already_deasserted = false;
38 #endif
39+#endif
40
41 #if defined(MODULE) && defined(PVR_LDM_PLATFORM_MODULE) && \
42 !defined(PVR_USE_PRE_REGISTERED_PLATFORM_DEV)
43@@ -388,11 +394,14 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
44 #endif
45 {
46 SYS_DATA *psSysData;
47- int ret;
48+ int ret;
49+ struct device *dev = &pDevice->dev;
50+ struct gfx_sgx_platform_data *pdata = dev->platform_data;
51+
52 PVR_TRACE(("PVRSRVDriverProbe(pDevice=%p)", pDevice));
53 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
54+#ifdef CONFIG_RESET_CONTROLLER
55 rstc = reset_control_get(&pDevice->dev, NULL);
56-
57 if (IS_ERR(rstc))
58 {
59 dev_err(&pDevice->dev, "%s: error: reset_control_get\n", __func__);
60@@ -403,7 +412,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
61
62 if (ret < 0)
63 {
64- dev_err(&pDevice->dev, "%s: error: reset_control_clear_reset\n", __func__);
65+ dev_err(dev, "%s: error: reset_control_clear_reset\n", __func__);
66 return ret;
67 }
68
69@@ -413,11 +422,22 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
70 {
71 already_deasserted = true;
72 }
73- else if (ret < 0)
74+ else if (ret < 0)
75 {
76- dev_err(&pDevice->dev, "%s: error: reset_control_deassert\n", __func__);
77+ dev_err(dev, "%s: error: reset_control_deassert\n", __func__);
78 return ret;
79 }
80+#else
81+ if (pdata && pdata->deassert_reset) {
82+ ret = pdata->deassert_reset(pDevice, pdata->reset_name);
83+ if (ret) {
84+ dev_err(dev, "Unable to reset SGX!\n");
85+ }
86+ } else {
87+ dev_err(dev, "SGX Platform data missing deassert_reset!\n");
88+ return -ENODEV;
89+ }
90+#endif /* CONFIG_RESET_CONTROLLER */
91 #endif
92
93 #if 0 /* INTEGRATION_POINT */
94@@ -432,7 +452,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
95 {
96 return -EINVAL;
97 }
98-#endif
99+#endif
100 /* SysInitialise only designed to be called once.
101 */
102 psSysData = SysAcquireDataNoCheck();
103@@ -445,6 +465,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
104 }
105 }
106 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
107+#ifdef CONFIG_RESET_CONTROLLER
108 if (!already_deasserted)
109 {
110 ret = reset_control_is_reset(rstc);
111@@ -454,6 +475,7 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
112 }
113 }
114 reset_control_put(rstc);
115+#endif /* CONFIG_RESET_CONTROLLER */
116 #endif
117
118 return PVRSRVIONClientCreate();
119--
1201.9.1
121
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0003-SGX-displayclass-am335x-am437x-fix-mutex-deadlock-wa.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0003-SGX-displayclass-am335x-am437x-fix-mutex-deadlock-wa.patch
deleted file mode 100644
index 0e2902d3..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0003-SGX-displayclass-am335x-am437x-fix-mutex-deadlock-wa.patch
+++ /dev/null
@@ -1,153 +0,0 @@
1From cf5156ff82e14fe01a194f9fa9a9adc528ac72f0 Mon Sep 17 00:00:00 2001
2From: Darren Etheridge <detheridge@ti.com>
3Date: Tue, 29 Jul 2014 15:39:56 -0500
4Subject: [PATCH 3/4] SGX: displayclass: am335x, am437x - fix mutex deadlock
5 warning
6
7Rearrange the locking semantics in the Unblank screen function to
8remove the kernel warning about a possible deadlock scenario.
9
10The warning presents itself on the console like this:
11[ 2976.202979] ======================================================
12[ 2976.202983] [ INFO: possible circular locking dependency detected ]
13[ 2976.202994] 3.14.11-00997-gb20d0ac-dirty #53 Tainted: G O
14[ 2976.202997] -------------------------------------------------------
15[ 2976.203005] OGLES2Chameleon/1203 is trying to acquire lock:
16[ 2976.203058] (console_lock){+.+.+.}, at: [<bf07a310>]
17OMAPLFBUnblankDisplay+0x24/0xbc [omaplfb]
18[ 2976.203062]
19[ 2976.203062] but task is already holding lock:
20[ 2976.203087] (&fb_info->lock){+.+.+.}, at: [<c0312358>]
21lock_fb_info+0x18/0x3c
22[ 2976.203090]
23[ 2976.203090] which lock already depends on the new lock.
24[ 2976.203090]
25[ 2976.203093]
26[ 2976.203093] the existing dependency chain (in reverse order) is:
27[ 2976.203101]
28[ 2976.203101] -> #1 (&fb_info->lock){+.+.+.}:
29[ 2976.203112] [<c0312358>] lock_fb_info+0x18/0x3c
30[ 2976.203124] [<c0313a7c>] register_framebuffer+0x174/0x26c
31[ 2976.203146] [<c033c314>] omapfb_create_framebuffers+0x48c/0x7ac
32[ 2976.203157] [<c033d3c4>] omapfb_probe+0x4d4/0x848
33[ 2976.203170] [<c0381cc8>] platform_drv_probe+0x18/0x48
34[ 2976.203189] [<c038096c>] driver_probe_device+0x10c/0x238
35[ 2976.203199] [<c0380b2c>] __driver_attach+0x94/0x98
36[ 2976.203208] [<c037f0f0>] bus_for_each_dev+0x54/0x88
37[ 2976.203216] [<c03800f0>] bus_add_driver+0xd8/0x1d8
38[ 2976.203223] [<c038115c>] driver_register+0x78/0xf4
39[ 2976.203234] [<c0008968>] do_one_initcall+0xe4/0x144
40[ 2976.203250] [<c07d3c18>] kernel_init_freeable+0xfc/0x1cc
41[ 2976.203261] [<c0563260>] kernel_init+0x8/0xec
42[ 2976.203275] [<c000e648>] ret_from_fork+0x14/0x2c
43[ 2976.203284]
44[ 2976.203284] -> #0 (console_lock){+.+.+.}:
45[ 2976.203301] [<c008bc00>] console_lock+0x4c/0x60
46[ 2976.203328] [<bf07a310>] OMAPLFBUnblankDisplay+0x24/0xbc [omaplfb]
47[ 2976.203340] [<bf0797f4>] OpenDCDevice+0x60/0x78 [omaplfb]
48[ 2976.203459] [<bf041ac0>] PVRSRVOpenDCDeviceKM+0xec/0x178 [pvrsrvkm]
49[ 2976.203654] [<bf05645c>] PVRSRVOpenDCDeviceBW+0x6c/0xac [pvrsrvkm]
50[ 2976.203811] [<bf056d10>] BridgedDispatchKM+0xf4/0x14c [pvrsrvkm]
51[ 2976.203966] [<bf04f304>] PVRSRV_BridgeDispatchKM+0xf0/0x204
52[pvrsrvkm]
53[ 2976.203987] [<c0129500>] do_vfs_ioctl+0x78/0x61c
54[ 2976.203997] [<c0129b08>] SyS_ioctl+0x64/0x74
55[ 2976.204013] [<c000e580>] ret_fast_syscall+0x0/0x48
56[ 2976.204016]
57[ 2976.204016] other info that might help us debug this:
58[ 2976.204016]
59[ 2976.204019] Possible unsafe locking scenario:
60[ 2976.204019]
61[ 2976.204022] CPU0 CPU1
62[ 2976.204024] ---- ----
63[ 2976.204030] lock(&fb_info->lock);
64[ 2976.204036] lock(console_lock);
65[ 2976.204041] lock(&fb_info->lock);
66[ 2976.204046] lock(console_lock);
67[ 2976.204048]
68[ 2976.204048] *** DEADLOCK ***
69[ 2976.204048]
70[ 2976.204055] 2 locks held by OGLES2Chameleon/1203:
71[ 2976.204217] #0: (psPVRSRVMutex#2/1){+.+.+.}, at: [<bf04f238>]
72PVRSRV_BridgeDispatchKM+0x24/0x204 [pvrsrvkm]
73[ 2976.204240] #1: (&fb_info->lock){+.+.+.}, at: [<c0312358>]
74lock_fb_info+0x18/0x3c
75
76Signed-off-by: Darren Etheridge <detheridge@ti.com>
77---
78 GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c | 8 +++++---
79 GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c | 7 +++++--
80 2 files changed, 10 insertions(+), 5 deletions(-)
81
82diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
83index 3857b95..a5cc7d0 100644
84--- a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
85+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/omaplfb_linux.c
86@@ -812,10 +812,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
87 {
88 #ifdef FBDEV_PRESENT
89 int res;
90+
91+ OMAPLFB_CONSOLE_LOCK();
92 if (!lock_fb_info(psDevInfo->psLINFBInfo))
93 {
94 printk(KERN_ERR DRIVER_PREFIX
95 ": %s: Device %u: Couldn't lock FB info\n", __FUNCTION__, psDevInfo->uiFBDevID);
96+ OMAPLFB_CONSOLE_UNLOCK();
97 return (OMAPLFB_ERROR_GENERIC);
98 }
99
100@@ -825,14 +828,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
101 * notification.
102 */
103
104-
105- OMAPLFB_CONSOLE_LOCK();
106 psDevInfo->psLINFBInfo->flags |= FBINFO_MISC_USEREVENT;
107 res = fb_blank(psDevInfo->psLINFBInfo, bBlank ? 1 : 0);
108 psDevInfo->psLINFBInfo->flags &= ~FBINFO_MISC_USEREVENT;
109
110- OMAPLFB_CONSOLE_UNLOCK();
111 unlock_fb_info(psDevInfo->psLINFBInfo);
112+ OMAPLFB_CONSOLE_UNLOCK();
113+
114 if (res != 0 && res != -EINVAL)
115 {
116 printk(KERN_ERR DRIVER_PREFIX
117diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c
118index c79dbd0..58b8640 100755
119--- a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c
120+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/omaplfb_linux.c
121@@ -948,10 +948,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
122 {
123 #ifdef FBDEV_PRESENT
124 int res;
125+
126+ OMAPLFB_CONSOLE_LOCK();
127 if (!lock_fb_info(psDevInfo->psLINFBInfo))
128 {
129 printk(KERN_ERR DRIVER_PREFIX
130 ": %s: Device %u: Couldn't lock FB info\n", __FUNCTION__, psDevInfo->uiFBDevID);
131+ OMAPLFB_CONSOLE_UNLOCK();
132 return (OMAPLFB_ERROR_GENERIC);
133 }
134
135@@ -961,13 +964,13 @@ static OMAPLFB_ERROR OMAPLFBBlankOrUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo, IM
136 * notification.
137 */
138
139- OMAPLFB_CONSOLE_LOCK();
140 psDevInfo->psLINFBInfo->flags |= FBINFO_MISC_USEREVENT;
141 res = fb_blank(psDevInfo->psLINFBInfo, bBlank ? 1 : 0);
142 psDevInfo->psLINFBInfo->flags &= ~FBINFO_MISC_USEREVENT;
143
144- OMAPLFB_CONSOLE_UNLOCK();
145 unlock_fb_info(psDevInfo->psLINFBInfo);
146+ OMAPLFB_CONSOLE_UNLOCK();
147+
148 if (res != 0 && res != -EINVAL)
149 {
150 printk(KERN_ERR DRIVER_PREFIX
151--
1521.9.1
153
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0004-SGX-linux-make-it-building-against-ti-linux-3.14.y.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0004-SGX-linux-make-it-building-against-ti-linux-3.14.y.patch
deleted file mode 100644
index ebd7e71b..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0004-SGX-linux-make-it-building-against-ti-linux-3.14.y.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From c9258e090aec91e70efa814e5a38048b0c45754a Mon Sep 17 00:00:00 2001
2From: Darren Etheridge <detheridge@ti.com>
3Date: Tue, 29 Jul 2014 15:54:14 -0500
4Subject: [PATCH 4/4] SGX: linux: make it building against ti-linux-3.14.y
5
6The fbdev drivers moved into their own directory under drivers/video.
7All of the omap2 dss stuff moved there as well so update the Makefile
8to point to the right place.
9
10Keep the old directory around to not break builds against older kernel.
11
12Signed-off-by: Darren Etheridge <detheridge@ti.com>
13Signed-off-by: Denys Dmytriyenko <denys@ti.com>
14---
15 GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild | 1 +
16 GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild | 1 +
17 2 files changed, 2 insertions(+)
18
19diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild
20index 1ae2359..9e0c843 100755
21--- a/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild
22+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti335x_linux/Kbuild
23@@ -15,6 +15,7 @@ EXTRA_CFLAGS = -DLINUX \
24 -I$(PVR_BUILD_DIR)/services4/include \
25 -I$(PVR_BUILD_DIR)/services4/system/$(PVR_SYSTEM) \
26 -I$(KERNELDIR)/drivers/video/omap2 \
27+ -I$(KERNELDIR)/drivers/video/fbdev/omap2 \
28 -I$(PVR_BUILD_DIR)/services4/system/include \
29 $(SYS_CFLAGS.1) \
30
31diff --git a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild
32index 1ae2359..9e0c843 100755
33--- a/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild
34+++ b/GFX_Linux_KM/services4/3rdparty/dc_ti43xx_linux/Kbuild
35@@ -15,6 +15,7 @@ EXTRA_CFLAGS = -DLINUX \
36 -I$(PVR_BUILD_DIR)/services4/include \
37 -I$(PVR_BUILD_DIR)/services4/system/$(PVR_SYSTEM) \
38 -I$(KERNELDIR)/drivers/video/omap2 \
39+ -I$(KERNELDIR)/drivers/video/fbdev/omap2 \
40 -I$(PVR_BUILD_DIR)/services4/system/include \
41 $(SYS_CFLAGS.1) \
42
43--
442.0.2
45
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb
deleted file mode 100644
index f033effc..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb
+++ /dev/null
@@ -1,81 +0,0 @@
1DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs (for X11)"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=ea5743acf520dd81ca172e69f818a3d4"
4
5TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
6require ../../recipes-ti/includes/ti-eula-unpack.inc
7
8SGXPV = "4_09_00_01"
9IMGPV = "1.9.2188537"
10
11inherit module
12
13MACHINE_KERNEL_PR_append = "d"
14PR = "${MACHINE_KERNEL_PR}"
15
16# Select the corresponding hardfp/softfp filename and checksums based on tune flags
17BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
18MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
19SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
20
21BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
22MD5SUM_HARDFP = "c9f656dce062d1ab10afffd4dfb71b67"
23SHA256SUM_HARDFP = "dbfeba8e1298f139495816334edec1455e6b49b1e11bd1b2aa0a888e5788bb6b"
24
25BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
26
27SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE}"
28
29SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
30SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
31
32TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
33S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
34
35PVRBUILD = "release"
36export KERNELDIR = "${STAGING_KERNEL_DIR}"
37
38INHIBIT_PACKAGE_STRIP = "1"
39
40TI_PLATFORM_omap3 = "omap3630"
41TI_PLATFORM_ti814x = "ti81xx"
42TI_PLATFORM_ti816x = "ti81xx"
43TI_PLATFORM_ti33x = "ti335x"
44
45MODULESLOCATION_omap3 = "dc_omapfb3_linux"
46MODULESLOCATION_ti814x = "dc_ti81xx_linux"
47MODULESLOCATION_ti816x = "dc_ti81xx_linux"
48MODULESLOCATION_ti33x = "dc_ti335x_linux"
49
50export SUPPORT_XORG ?= "1"
51
52MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
53
54do_compile() {
55 export TOOLCHAIN="${TOOLCHAIN_PATH}"
56 export PLAT_CC="${CC}"
57 export PLAT_CPP="${CXX}"
58 export PLAR_AR="${AR}"
59 for kernelver in ${WORKDIR}/../../${PREFERRED_PROVIDER_virtual/kernel}/* ; do
60 cp -f $kernelver/git/drivers/gpu/drm/*.c ${S}/services4/3rdparty/linux_drm/
61 done
62 if [ $(echo -e "${KERNEL_VERSION}\n3.3" | sort --version-sort | head -1) = "3.3" ] ; then
63 cp -f ${S}/services4/3rdparty/linux_drm/Kbuild_3.3 \
64 ${S}/services4/3rdparty/linux_drm/Kbuild || true
65 else
66 if [ $(echo -e "${KERNEL_VERSION}\n3.2" | sort --version-sort | head -1) = "3.2" ] ; then
67 cp -f ${S}/services4/3rdparty/linux_drm/Kbuild_3.2 \
68 ${S}/services4/3rdparty/linux_drm/Kbuild || true
69 fi
70 fi
71 oe_runmake BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}
72}
73
74do_install() {
75 mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
76 cp ${S}/pvrsrvkm.ko \
77 ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
78 ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
79
80 cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
81}
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch
deleted file mode 100644
index fc315bce..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules/Compile-fixes-for-38-kernel.patch
+++ /dev/null
@@ -1,346 +0,0 @@
1--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c-orig 2011-03-08 04:27:35.000000000 -0800
2+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c 2011-03-17 13:11:31.000000000 -0700
3@@ -235,9 +235,20 @@ static OMAP_ERROR UnblankDisplay(OMAPLFB
4 {
5 int res;
6
7+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
8+ console_lock();
9+#else
10 acquire_console_sem();
11+#endif
12+
13 res = fb_blank(psDevInfo->psLINFBInfo, 0);
14+
15+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
16+ console_unlock();
17+#else
18 release_console_sem();
19+#endif
20+
21 #if !defined (CONFIG_OMAP2_DSS)
22 if (res != 0 && res != -EINVAL)
23 {
24@@ -1118,7 +1129,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
25 OMAP_ERROR eError = OMAP_ERROR_GENERIC;
26 unsigned long FBSize;
27
28+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
29+ console_lock();
30+#else
31 acquire_console_sem();
32+#endif
33
34 if (fb_idx < 0 || fb_idx >= num_registered_fb)
35 {
36@@ -1254,7 +1269,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
37 errModPut:
38 module_put(psLINFBOwner);
39 errRelSem:
40+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
41+ console_unlock();
42+#else
43 release_console_sem();
44+#endif
45 return eError;
46 }
47
48@@ -1263,7 +1282,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
49 struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo;
50 struct module *psLINFBOwner;
51
52+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
53+ console_lock();
54+#else
55 acquire_console_sem();
56+#endif
57
58 psLINFBOwner = psLINFBInfo->fbops->owner;
59
60@@ -1274,7 +1297,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
61
62 module_put(psLINFBOwner);
63
64+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
65+ console_unlock();
66+#else
67 release_console_sem();
68+#endif
69 }
70
71 OMAP_ERROR OMAPLFBInit(void)
72--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-03-08 04:27:35.000000000 -0800
73+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-03-17 13:40:15.000000000 -0700
74@@ -24,11 +24,14 @@
75 *
76 ******************************************************************************/
77
78+#include <linux/version.h>
79+
80+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
81 #ifndef AUTOCONF_INCLUDED
82 #include <linux/config.h>
83 #endif
84+#endif
85
86-#include <linux/version.h>
87 #include <linux/module.h>
88
89 #include <linux/pci.h>
90--- GFX_Linux_KM/services4/srvkm/common/resman.c-orig 2011-03-08 04:27:36.000000000 -0800
91+++ GFX_Linux_KM/services4/srvkm/common/resman.c 2011-03-17 14:20:07.000000000 -0700
92@@ -24,15 +24,17 @@
93 *
94 ******************************************************************************/
95
96+#include <linux/version.h>
97 #include "services_headers.h"
98 #include "resman.h"
99
100 #ifdef __linux__
101+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
102 #ifndef AUTOCONF_INCLUDED
103 #include <linux/config.h>
104 #endif
105+#endif
106
107-#include <linux/version.h>
108 #include <linux/sched.h>
109 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
110 #include <linux/hardirq.h>
111--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-08 04:27:36.000000000 -0800
112+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-17 14:33:09.000000000 -0700
113@@ -24,9 +24,13 @@
114 *
115 ******************************************************************************/
116
117+#include <linux/version.h>
118+
119+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
120 #ifndef AUTOCONF_INCLUDED
121 #include <linux/config.h>
122 #endif
123+#endif
124
125 #include <asm/io.h>
126 #include <asm/uaccess.h>
127--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h-orig 2011-03-08 04:27:36.000000000 -0800
128+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h 2011-03-17 14:39:14.000000000 -0700
129@@ -27,11 +27,14 @@
130 #ifndef __PVR_UACCESS_H__
131 #define __PVR_UACCESS_H__
132
133+#include <linux/version.h>
134+
135+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
136 #ifndef AUTOCONF_INCLUDED
137 #include <linux/config.h>
138 #endif
139+#endif
140
141-#include <linux/version.h>
142 #include <asm/uaccess.h>
143
144 static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes)
145--- GFX_Linux_KM/services4/srvkm/env/linux/mm.c-orig 2011-03-08 04:27:36.000000000 -0800
146+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.c 2011-03-17 14:46:23.000000000 -0700
147@@ -24,11 +24,14 @@
148 *
149 ******************************************************************************/
150
151+#include <linux/version.h>
152+
153+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
154 #ifndef AUTOCONF_INCLUDED
155 #include <linux/config.h>
156 #endif
157+#endif
158
159-#include <linux/version.h>
160 #include <linux/mm.h>
161 #include <linux/vmalloc.h>
162 #include <asm/io.h>
163--- GFX_Linux_KM/services4/srvkm/env/linux/mutils.h-orig 2011-03-08 04:27:36.000000000 -0800
164+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.h 2011-03-17 14:54:37.000000000 -0700
165@@ -27,11 +27,13 @@
166 #ifndef __IMG_LINUX_MUTILS_H__
167 #define __IMG_LINUX_MUTILS_H__
168
169+#include <linux/version.h>
170+
171+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
172 #ifndef AUTOCONF_INCLUDED
173 #include <linux/config.h>
174 #endif
175-
176-#include <linux/version.h>
177+#endif
178
179 #if !(defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)))
180 #if defined(SUPPORT_LINUX_X86_PAT)
181--- GFX_Linux_KM/services4/srvkm/env/linux/mm.h-orig 2011-03-08 04:27:36.000000000 -0800
182+++ GFX_Linux_KM/services4/srvkm/env/linux/mm.h 2011-03-17 15:33:56.000000000 -0700
183@@ -27,11 +27,14 @@
184 #ifndef __IMG_LINUX_MM_H__
185 #define __IMG_LINUX_MM_H__
186
187+#include <linux/version.h>
188+
189+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
190 #ifndef AUTOCONF_INCLUDED
191 #include <linux/config.h>
192 #endif
193+#endif
194
195-#include <linux/version.h>
196 #include <linux/slab.h>
197 #include <linux/mm.h>
198 #include <linux/list.h>
199--- GFX_Linux_KM/services4/srvkm/env/linux/mmap.c-orig 2011-03-17 20:39:31.000000000 -0700
200+++ GFX_Linux_KM/services4/srvkm/env/linux/mmap.c 2011-03-17 20:40:00.000000000 -0700
201@@ -24,11 +24,14 @@
202 *
203 ******************************************************************************/
204
205+#include <linux/version.h>
206+
207+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
208 #ifndef AUTOCONF_INCLUDED
209 #include <linux/config.h>
210 #endif
211+#endif
212
213-#include <linux/version.h>
214 #include <linux/mm.h>
215 #include <linux/module.h>
216 #include <linux/vmalloc.h>
217--- GFX_Linux_KM/services4/srvkm/env/linux/proc.c-orig 2011-03-08 04:27:36.000000000 -0800
218+++ GFX_Linux_KM/services4/srvkm/env/linux/proc.c 2011-03-17 21:01:35.000000000 -0700
219@@ -24,13 +24,16 @@
220 *
221 ******************************************************************************/
222
223+#include <linux/version.h>
224+
225+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
226 #ifndef AUTOCONF_INCLUDED
227 #include <linux/config.h>
228 #endif
229+#endif
230
231 #include <linux/init.h>
232 #include <linux/module.h>
233-#include <linux/version.h>
234 #include <linux/fs.h>
235 #include <linux/proc_fs.h>
236 #include <linux/seq_file.h>
237--- GFX_Linux_KM/services4/srvkm/env/linux/module.c-orig 2011-03-08 04:27:36.000000000 -0800
238+++ GFX_Linux_KM/services4/srvkm/env/linux/module.c 2011-03-17 21:32:19.000000000 -0700
239@@ -24,9 +24,13 @@
240 *
241 ******************************************************************************/
242
243+#include <linux/version.h>
244+
245+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
246 #ifndef AUTOCONF_INCLUDED
247 #include <linux/config.h>
248 #endif
249+#endif
250
251 #if !defined(SUPPORT_DRI_DRM)
252
253@@ -44,7 +48,6 @@
254 #include <linux/init.h>
255 #include <linux/kernel.h>
256 #include <linux/module.h>
257-#include <linux/version.h>
258 #include <linux/fs.h>
259 #include <linux/proc_fs.h>
260
261--- GFX_Linux_KM/services4/srvkm/env/linux/event.c-orig 2011-03-08 04:27:36.000000000 -0800
262+++ GFX_Linux_KM/services4/srvkm/env/linux/event.c 2011-03-18 08:51:42.000000000 -0700
263@@ -24,11 +24,14 @@
264 *
265 ******************************************************************************/
266
267+#include <linux/version.h>
268+
269+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
270 #ifndef AUTOCONF_INCLUDED
271 #include <linux/config.h>
272 #endif
273+#endif
274
275-#include <linux/version.h>
276 #include <asm/io.h>
277 #include <asm/page.h>
278 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
279--- GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c-orig 2011-03-08 04:27:36.000000000 -0800
280+++ GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c 2011-03-18 08:58:16.000000000 -0700
281@@ -24,11 +24,14 @@
282 *
283 ******************************************************************************/
284
285+#include <linux/version.h>
286+
287+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
288 #ifndef AUTOCONF_INCLUDED
289 #include <linux/config.h>
290 #endif
291+#endif
292
293-#include <linux/version.h>
294 #include <asm/io.h>
295 #include <asm/page.h>
296 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
297--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c-orig 2011-03-08 04:27:36.000000000 -0800
298+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c 2011-03-18 09:01:06.000000000 -0700
299@@ -26,14 +26,17 @@
300
301 #if defined(SUPPORT_DRI_DRM)
302
303+#include <linux/version.h>
304+
305+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
306 #ifndef AUTOCONF_INCLUDED
307 #include <linux/config.h>
308 #endif
309+#endif
310
311 #include <linux/init.h>
312 #include <linux/kernel.h>
313 #include <linux/module.h>
314-#include <linux/version.h>
315 #include <linux/fs.h>
316 #include <linux/proc_fs.h>
317 #include <asm/ioctl.h>
318--- GFX_Linux_KM/services4/srvkm/env/linux/mutils.c-orig 2011-03-08 04:27:36.000000000 -0800
319+++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.c 2011-03-18 09:08:12.000000000 -0700
320@@ -24,10 +24,13 @@
321 *
322 ******************************************************************************/
323
324+#include <linux/version.h>
325+
326+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
327 #ifndef AUTOCONF_INCLUDED
328 #include <linux/config.h>
329 #endif
330-#include <linux/version.h>
331+#endif
332
333 #include <linux/spinlock.h>
334 #include <linux/mm.h>
335--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-31 13:46:48.000000000 -0700
336+++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-31 15:14:10.000000000 -0700
337@@ -76,7 +76,8 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG
338 static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ;
339
340
341-static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED;
342+static DEFINE_SPINLOCK(gsDebugLockIRQ);
343+
344
345 #if !defined (USE_SPIN_LOCK)
346 #define USE_SPIN_LOCK (in_interrupt() || !preemptible())
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch
deleted file mode 100644
index 269d459b..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules/kernel-30.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From: Steve Sakoman
2Subject: omap3-sgx-modules: Fix build for Linux 3.0
3
4This patch implements the header change from plat/display.h to video/omapdss.h
5
6Signed-off-by: Steve Sakoman <steve at sakoman.com>
7
8--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-08-01 07:21:45.000000000 -0700
9+++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-08-01 07:29:32.000000000 -0700
10@@ -47,12 +47,12 @@
11 #if defined (SUPPORT_TI_DSS_FW)
12 #include <asm/io.h>
13
14-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
15-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
16+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)))
17+#include <video/omapdss.h>
18+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
19 #include <plat/display.h>
20-#else
21+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
22 #include <mach/display.h>
23-#endif
24 #else
25 #include <asm/arch-omap/display.h>
26 #endif
27@@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign
28 extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);
29 extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);
30 #else
31+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))
32+#include <video/omapdss.h>
33+#else
34 #include <plat/display.h>
35+#endif
36 #include <linux/console.h>
37 #include <linux/fb.h>
38 static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb
deleted file mode 100644
index a54a643b..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb
+++ /dev/null
@@ -1,39 +0,0 @@
1DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=21228a42e27d1d104b31a83f7c9da935"
4
5TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
6require ../../recipes-ti/includes/ti-eula-unpack.inc
7
8SGXPV = "4_05_00_03"
9BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin"
10
11inherit module
12
13MACHINE_KERNEL_PR_append = "c"
14PR = "${MACHINE_KERNEL_PR}"
15
16DEFAULT_PREFERENCE_omap3 = "99"
17
18SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin \
19 "
20SRC_URI[md5sum] = "0e651eaa92bb91760f0b40a17697a7dc"
21SRC_URI[sha256sum] = "bfe764a8959556195545d6fff76f63a489642f345c105bbbc309a3f243c2dd0e"
22TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
23S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
24
25PVRBUILD = "release"
26export KERNELDIR = "${STAGING_KERNEL_DIR}"
27
28INHIBIT_PACKAGE_STRIP = "1"
29
30TI_PLATFORM_omap3 = "omap3630"
31TI_PLATFORM_ti814x = "ti81xx"
32TI_PLATFORM_ti816x = "ti81xx"
33TI_PLATFORM_ti33x = "ti335x"
34
35MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM}"
36
37do_install() {
38 make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
39}
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
deleted file mode 100644
index cd6dbe42..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
+++ /dev/null
@@ -1,53 +0,0 @@
1DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=ea5743acf520dd81ca172e69f818a3d4"
4
5TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
6require ../../recipes-ti/includes/ti-eula-unpack.inc
7
8SGXPV = "4_09_00_01"
9IMGPV = "1.9.2188537"
10
11inherit module
12
13MACHINE_KERNEL_PR_append = "d"
14PR = "${MACHINE_KERNEL_PR}"
15
16DEFAULT_PREFERENCE = "-1"
17
18# Select the corresponding hardfp/softfp filename and checksums based on tune flags
19BINFILE_SOFTFP = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
20MD5SUM_SOFTFP = "bd35e9d8843aff3a2aca9d41e7db1c7d"
21SHA256SUM_SOFTFP = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
22
23BINFILE_HARDFP = "Graphics_SDK_setuplinux_${SGXPV}_hardfp_minimal_demos.bin"
24MD5SUM_HARDFP = "c9f656dce062d1ab10afffd4dfb71b67"
25SHA256SUM_HARDFP = "dbfeba8e1298f139495816334edec1455e6b49b1e11bd1b2aa0a888e5788bb6b"
26
27BINFILE = "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${BINFILE_HARDFP}', '${BINFILE_SOFTFP}', d)}"
28
29SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE}"
30
31SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}"
32SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${SHA256SUM_HARDFP}', '${SHA256SUM_SOFTFP}', d)}"
33
34TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
35S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
36
37PVRBUILD = "release"
38export KERNELDIR = "${STAGING_KERNEL_DIR}"
39
40INHIBIT_PACKAGE_STRIP = "1"
41
42TI_PLATFORM_omap3 = "omap3630"
43TI_PLATFORM_ti814x = "ti81xx"
44TI_PLATFORM_ti816x = "ti81xx"
45TI_PLATFORM_ti33x = "ti335x"
46
47MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=0"
48
49MAKE_TARGETS_append_ti33x = " PM_RUNTIME=1"
50
51do_install() {
52 make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
53}
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb
deleted file mode 100644
index 1ac60da7..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb
+++ /dev/null
@@ -1,62 +0,0 @@
1DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"
4
5TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
6require ../../recipes-ti/includes/ti-eula-unpack.inc
7
8SGXPV = "5_01_01_01"
9IMGPV = "1.10.2359475"
10
11inherit module
12
13MACHINE_KERNEL_PR_append = "d"
14PR = "${MACHINE_KERNEL_PR}"
15
16BINFILE_HARDFP = "Graphics_SDK_setuplinux_hardfp_${SGXPV}.bin"
17MD5SUM_HARDFP = "94acdbd20152c905939c2448d5e80a72"
18SHA256SUM_HARDFP = "7f647bf45a5ce8ba9aaa28c4afe85fced4275f9a4567a1886d4460b76c9051ae"
19
20# For now we only have hardfp version
21python __anonymous() {
22 tunes = bb.data.getVar("TUNE_FEATURES", d, 1)
23 if not tunes:
24 return
25 pkgn = bb.data.getVar("PN", d, 1)
26 pkgv = bb.data.getVar("PV", d, 1)
27 if "callconvention-hard" not in tunes:
28 bb.warn("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
29 raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
30}
31
32BINFILE := "${BINFILE_HARDFP}"
33
34SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/gfxsdk/${SGXPV}/exports/${BINFILE}"
35
36SRC_URI += "file://0001-PoC-GFX-SDK-Make-5_01_01_01-work-against-3.14-LTS.patch;striplevel=2 \
37 file://0002-SGX-linux-use-platform-data-to-provide-reset-info.patch;striplevel=2 \
38 file://0003-SGX-displayclass-am335x-am437x-fix-mutex-deadlock-wa.patch;striplevel=2 \
39 file://0004-SGX-linux-make-it-building-against-ti-linux-3.14.y.patch;striplevel=2"
40
41SRC_URI[md5sum] := "${MD5SUM_HARDFP}"
42SRC_URI[sha256sum] := "${SHA256SUM_HARDFP}"
43
44TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
45S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
46
47PVRBUILD = "release"
48export KERNELDIR = "${STAGING_KERNEL_DIR}"
49
50INHIBIT_PACKAGE_STRIP = "1"
51
52TI_PLATFORM_omap3 = "omap3630"
53TI_PLATFORM_ti814x = "ti81xx"
54TI_PLATFORM_ti816x = "ti81xx"
55TI_PLATFORM_ti33x = "ti335x"
56TI_PLATFORM_ti43x = "ti43xx"
57
58MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
59
60do_install() {
61 make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
62}
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb
deleted file mode 100644
index cf042fcd..00000000
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb
+++ /dev/null
@@ -1,58 +0,0 @@
1DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"
4
5TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
6require ../../recipes-ti/includes/ti-eula-unpack.inc
7
8SGXPV = "5_01_01_02"
9IMGPV = "1.10.2359475"
10
11inherit module
12
13MACHINE_KERNEL_PR_append = "b"
14PR = "${MACHINE_KERNEL_PR}"
15
16BINFILE_HARDFP = "Graphics_SDK_setuplinux_hardfp_${SGXPV}.bin"
17MD5SUM_HARDFP = "94bcb31ea7eb50df1dfa4037055b638e"
18SHA256SUM_HARDFP = "54641222cdb49b03f996cbd6412de227198d9e084f5647d706bbf4217e8cdb07"
19
20# For now we only have hardfp version
21python __anonymous() {
22 tunes = bb.data.getVar("TUNE_FEATURES", d, 1)
23 if not tunes:
24 return
25 pkgn = bb.data.getVar("PN", d, 1)
26 pkgv = bb.data.getVar("PV", d, 1)
27 if "callconvention-hard" not in tunes:
28 bb.warn("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
29 raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
30}
31
32BINFILE := "${BINFILE_HARDFP}"
33
34SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/gfxsdk/${SGXPV}/exports/${BINFILE}"
35
36
37SRC_URI[md5sum] := "${MD5SUM_HARDFP}"
38SRC_URI[sha256sum] := "${SHA256SUM_HARDFP}"
39
40TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
41S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
42
43PVRBUILD = "release"
44export KERNELDIR = "${STAGING_KERNEL_DIR}"
45
46INHIBIT_PACKAGE_STRIP = "1"
47
48TI_PLATFORM_omap3 = "omap3630"
49TI_PLATFORM_ti814x = "ti81xx"
50TI_PLATFORM_ti816x = "ti81xx"
51TI_PLATFORM_ti33x = "ti335x"
52TI_PLATFORM_ti43x = "ti43xx"
53
54MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
55
56do_install() {
57 make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
58}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 08:24:45 +0000