Revert "Workaround for booting time crash in R-CarH3SK wth Kingfisher board"

This reverts commit 59de37c489c605103b90924dbfa2c42b8eeda7d8.

This patch is workaround for kernel-module-gles in BSP5.5.
In BSP 5.9, this issue was resolved.

GL-Bug : SPEC-4269

Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Change-Id: I8b4f0ea675a8d296d0489c0d5837be25173117fe
(cherry picked from commit 3d80d329b12d0f5f38314d835a6f7955c2edc006)

diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
index c230e5a..d0a6a50 100644 (file)
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
@@ -1,5 +1 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI:append = " file://0001-Fix-fw-download-issue.patch"
-
 RDEPENDS:${PN}:append = " gles-user-module-firmware"

diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles/0001-Fix-fw-download-issue.patch b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles/0001-Fix-fw-download-issue.patch
deleted file mode 100644 (file)
index a44e8ef..0000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles/0001-Fix-fw-download-issue.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d7a7ad476dee136e21fc7de112003528f7675007 Mon Sep 17 00:00:00 2001
-From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
-Date: Wed, 1 Dec 2021 08:16:24 +0900
-Subject: [PATCH] Fix fw download issue
-
----
- services/server/env/linux/module_common.c | 26 ++++++++++++++++-------
- 1 file changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/services/server/env/linux/module_common.c b/services/server/env/linux/module_common.c
-index 5822dab..3c97b28 100644
---- a/services/server/env/linux/module_common.c
-+++ b/services/server/env/linux/module_common.c
-@@ -416,6 +416,10 @@ int PVRSRVDeviceResume(PVRSRV_DEVICE_NODE *psDeviceNode)
-       return 0;
- }
- 
-+//HACK
-+static DEFINE_MUTEX(rgx_initialize_mutex);
-+//HACK
-+
- /**************************************************************************/ /*!
- @Function     PVRSRVDeviceOpen
- @Description  Common device open.
-@@ -455,18 +459,24 @@ int PVRSRVDeviceOpen(PVRSRV_DEVICE_NODE *psDeviceNode,
- 
-       if (psDeviceNode->eDevState == PVRSRV_DEVICE_STATE_INIT)
-       {
--              eError = PVRSRVCommonDeviceInitialise(psDeviceNode);
--              if (eError != PVRSRV_OK)
-+              mutex_lock(&rgx_initialize_mutex);
-+              if (psDeviceNode->eDevState == PVRSRV_DEVICE_STATE_INIT)
-               {
--                      PVR_DPF((PVR_DBG_ERROR, "%s: Failed to initialise device (%s)",
--                                       __func__, PVRSRVGetErrorString(eError)));
--                      iErr = -ENODEV;
--                      goto out;
--              }
-+                      eError = PVRSRVCommonDeviceInitialise(psDeviceNode);
-+                      if (eError != PVRSRV_OK)
-+                      {
-+                              PVR_DPF((PVR_DBG_ERROR, "%s: Failed to initialise device (%s)",
-+                                               __func__, PVRSRVGetErrorString(eError)));
-+                              iErr = -ENODEV;
-+                              mutex_unlock(&rgx_initialize_mutex);
-+                              goto out;
-+                      }
- 
- #if defined(SUPPORT_RGX)
--              PVRGpuTraceInitIfEnabled(psDeviceNode);
-+                      PVRGpuTraceInitIfEnabled(psDeviceNode);
- #endif
-+              }
-+              mutex_unlock(&rgx_initialize_mutex);
-       }
- 
-       sPrivData.psDevNode = psDeviceNode;
--- 
-2.25.1
-