ti-sgx-ddk-km: update SGX kernel driver for k4.14

Note: This is a tentative patch to enable graphics support.
      We shall merge both local patches to the ti-sgx-km repo soon.

Signed-off-by: Anand Balagopalakrishnan <anandb@ti.com>
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

2 files changed, 40 insertions, 2 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
new file mode 100644
index 00000000..cde6b3d8
--- /dev/null
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-pvr_drm.c-fix-undeclared-identifier-error-for-AM3-4-.patch
@@ -0,0 +1,37 @@
+From 1ee059ed47b379c1cd9494c507a4a1e67dc90cf2 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-ruei1@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@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_1.14.3699939.bb b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.14.3699939.bb
index 03037977..09271776 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
@@ -20,15 +20,16 @@ RPROVIDES_${PN} = "omapdrm-pvr"
 RREPLACES_${PN} = "omapdrm-pvr"
 RCONFLICTS_${PN} = "omapdrm-pvr"
 
-BRANCH = "ti-img-sgx/${PV}/k4.9"
+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 \
 "
 
 S = "${WORKDIR}/git"
 
-SRCREV = "0086977380d3320d70a3abc78b95fa0641427073"
+SRCREV = "855889f437250b6572c75d12696ec4a998b9aef9"
 
 TARGET_PRODUCT_omap-a15 = "jacinto6evm"
 TARGET_PRODUCT_ti33x = "ti335x"