[meta-ti] [rocko/master][PATCH] ti-sgx-ddk-km: bump SRCREV to pick up two local patches

Eric Ruei e-ruei1 at ti.com
Wed Apr 4 06:50:34 PDT 2018


- pickup the latest release which includes two local patches
- remove those two local patches

Signed-off-by: Eric Ruei <e-ruei1 at ti.com>
---
 ...ix-undeclared-identifier-error-for-AM3-4-.patch | 37 ----------------------
 ...n-devicemem.c-suppress-implicit-fallthrou.patch | 26 ---------------
 .../powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb  |  7 ++--
 3 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch
 delete mode 100644 recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch

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 cde6b3d..0000000
--- 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 @@
-From 1ee059ed47b379c1cd9494c507a4a1e67dc90cf2 Mon Sep 17 00:00:00 2001
-From: Eric Ruei <e-ruei1 at ti.com>
-Date: Mon, 12 Mar 2018 17:56:50 -0400
-Subject: [PATCH 1/2] pvr_drm.c: fix undeclared identifier error for AM3/4
- builds
-
-The undeclared identifier error was introduced during the k4.14 migration
-and therefore was not applicable to the k4.4 and k4.9 branches.
-
-Signed-off-by: Eric Ruei <e-ruei1 at ti.com>
----
- eurasia_km/services4/srvkm/env/linux/pvr_drm.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
-index 39ee832..33f6c3d 100644
---- a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
-+++ b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
-@@ -655,12 +655,12 @@ static struct platform_driver sPVRPlatDriver =
- static int
- PVRSRVDrmProbe(struct platform_device *pDevice)
- {
--#if (AM_VERSION != 5)
--	struct gfx_sgx_platform_data *pdata = dev->platform_data;
--#endif
- 	int ret;
- 	struct device *dev = &pDevice->dev;
- 	struct drm_device *drm_dev;
-+#if (AM_VERSION != 5)
-+	struct gfx_sgx_platform_data *pdata = dev->platform_data;
-+#endif
- 
- 	PVR_TRACE(("PVRSRVDrmProbe"));
- 
--- 
-1.9.1
-
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 f2affec..0000000
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 621e02869be9958400fd045e1bb0f4f1d81a6918 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys at ti.com>
-Date: Fri, 10 Nov 2017 18:55:26 -0500
-Subject: [PATCH] srvkm/common/devicemem.c: suppress implicit fallthrough error
- in gcc7
-
-Signed-off-by: Denys Dmytriyenko <denys at ti.com>
----
- eurasia_km/services4/srvkm/common/devicemem.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/eurasia_km/services4/srvkm/common/devicemem.c b/eurasia_km/services4/srvkm/common/devicemem.c
-index baf7c41..c083c63 100644
---- a/eurasia_km/services4/srvkm/common/devicemem.c
-+++ b/eurasia_km/services4/srvkm/common/devicemem.c
-@@ -1071,6 +1071,7 @@ PVRSRV_ERROR FreeMemCallBackCommon(PVRSRV_KERNEL_MEM_INFO *psMemInfo,
- 			case PVRSRV_MEMTYPE_ION:
- 			case PVRSRV_MEMTYPE_DMABUF:
- 				freeExternal(psMemInfo);
-+				/* FALLTHRU */
- 			case PVRSRV_MEMTYPE_DEVICE:
- 			case PVRSRV_MEMTYPE_DEVICECLASS:
- #if defined(SUPPORT_ION)
--- 
-2.7.4
-
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 0927177..a4eb82a 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"
 
 BRANCH = "ti-img-sgx/${PV}/k4.14"
 
-SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH} \
-file://0001-srvkm-common-devicemem.c-suppress-implicit-fallthrou.patch \
-file://0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch \
-"
+SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "855889f437250b6572c75d12696ec4a998b9aef9"
+SRCREV = "d2b3959738cfcc6209e8e882d1989de790866c8f"
 
 TARGET_PRODUCT_omap-a15 = "jacinto6evm"
 TARGET_PRODUCT_ti33x = "ti335x"
-- 
1.9.1



More information about the meta-ti mailing list