summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authore-ruei1@ti.com <e-ruei1@ti.com>2018-04-04 19:50:34 +0000
committerDenys Dmytriyenko <denys@ti.com>2018-04-04 19:32:46 -0400
commit5fff1f1a4f8e23760ba1f04e7bdf79bfd7bae7c8 (patch)
tree4a531776f4e9f52a9e307ec494c4354c822349da
parent1689acba487430e9968491335e9f1c05446aad52 (diff)
downloadmeta-ti-5fff1f1a4f8e23760ba1f04e7bdf79bfd7bae7c8.tar.gz
ti-sgx-ddk-km: bump SRCREV to pick up two local patches
- pickup the latest release which includes two local patches - remove those two local patches Signed-off-by: Eric Ruei <e-ruei1@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch37
-rw-r--r--recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch26
-rw-r--r--recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb7
3 files changed, 2 insertions, 68 deletions
diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch
deleted file mode 100644
index cde6b3d8..00000000
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 1ee059ed47b379c1cd9494c507a4a1e67dc90cf2 Mon Sep 17 00:00:00 2001
2From: Eric Ruei <e-ruei1@ti.com>
3Date: Mon, 12 Mar 2018 17:56:50 -0400
4Subject: [PATCH 1/2] pvr_drm.c: fix undeclared identifier error for AM3/4
5 builds
6
7The undeclared identifier error was introduced during the k4.14 migration
8and therefore was not applicable to the k4.4 and k4.9 branches.
9
10Signed-off-by: Eric Ruei <e-ruei1@ti.com>
11---
12 eurasia_km/services4/srvkm/env/linux/pvr_drm.c | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
16index 39ee832..33f6c3d 100644
17--- a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
18+++ b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
19@@ -655,12 +655,12 @@ static struct platform_driver sPVRPlatDriver =
20 static int
21 PVRSRVDrmProbe(struct platform_device *pDevice)
22 {
23-#if (AM_VERSION != 5)
24- struct gfx_sgx_platform_data *pdata = dev->platform_data;
25-#endif
26 int ret;
27 struct device *dev = &pDevice->dev;
28 struct drm_device *drm_dev;
29+#if (AM_VERSION != 5)
30+ struct gfx_sgx_platform_data *pdata = dev->platform_data;
31+#endif
32
33 PVR_TRACE(("PVRSRVDrmProbe"));
34
35--
361.9.1
37
diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch
deleted file mode 100644
index f2affecb..00000000
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 621e02869be9958400fd045e1bb0f4f1d81a6918 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Fri, 10 Nov 2017 18:55:26 -0500
4Subject: [PATCH] srvkm/common/devicemem.c: suppress implicit fallthrough error
5 in gcc7
6
7Signed-off-by: Denys Dmytriyenko <denys@ti.com>
8---
9 eurasia_km/services4/srvkm/common/devicemem.c | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/eurasia_km/services4/srvkm/common/devicemem.c b/eurasia_km/services4/srvkm/common/devicemem.c
13index baf7c41..c083c63 100644
14--- a/eurasia_km/services4/srvkm/common/devicemem.c
15+++ b/eurasia_km/services4/srvkm/common/devicemem.c
16@@ -1071,6 +1071,7 @@ PVRSRV_ERROR FreeMemCallBackCommon(PVRSRV_KERNEL_MEM_INFO *psMemInfo,
17 case PVRSRV_MEMTYPE_ION:
18 case PVRSRV_MEMTYPE_DMABUF:
19 freeExternal(psMemInfo);
20+ /* FALLTHRU */
21 case PVRSRV_MEMTYPE_DEVICE:
22 case PVRSRV_MEMTYPE_DEVICECLASS:
23 #if defined(SUPPORT_ION)
24--
252.7.4
26
diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
index 09271776..a4eb82ae 100644
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
@@ -22,14 +22,11 @@ RCONFLICTS_${PN} = "omapdrm-pvr"
22 22
23BRANCH = "ti-img-sgx/${PV}/k4.14" 23BRANCH = "ti-img-sgx/${PV}/k4.14"
24 24
25SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH} \ 25SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
26file://0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch \
27file://0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch \
28"
29 26
30S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
31 28
32SRCREV = "855889f437250b6572c75d12696ec4a998b9aef9" 29SRCREV = "d2b3959738cfcc6209e8e882d1989de790866c8f"
33 30
34TARGET_PRODUCT_omap-a15 = "jacinto6evm" 31TARGET_PRODUCT_omap-a15 = "jacinto6evm"
35TARGET_PRODUCT_ti33x = "ti335x" 32TARGET_PRODUCT_ti33x = "ti335x"