From: Xianzhong <xianzhong.li@nxp.com>
Date: Tue, 13 Aug 2019 13:36:58 +0000 (+0800)
Subject: MGS-4964-2 [#imx-1533] fix GPU kernel ctrl-C issue
X-Git-Tag: rel_imx_4.19.35_1.1.0~125
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=395be307ec69df8ce51730c8a03478d2b9056969;p=linux.git

MGS-4964-2 [#imx-1533] fix GPU kernel ctrl-C issue

fix 6Q GPU panic with ctrl-c during galcore load/unload

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
---

diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
index f0b69fa073ed..8277bb154dad 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
@@ -814,8 +814,11 @@ gckKERNEL_Destroy(
             gcmkVERIFY_OK(gckEVENT_Destroy(Kernel->eventObj));
         }
 
-        /* Destroy hardware resources before destroying MMU. */
-        gcmkVERIFY_OK(gckHARDWARE_PreDestroy(Kernel->hardware));
+        if (Kernel->hardware)
+        {
+            /* Destroy hardware resources before destroying MMU. */
+            gcmkVERIFY_OK(gckHARDWARE_PreDestroy(Kernel->hardware));
+        }
 
         if (Kernel->mmu)
         {
@@ -831,8 +834,11 @@ gckKERNEL_Destroy(
 #endif
         }
 
-        /* Destroy the gckHARDWARE object. */
-        gcmkVERIFY_OK(gckHARDWARE_Destroy(Kernel->hardware));
+        if (Kernel->hardware)
+        {
+            /* Destroy the gckHARDWARE object. */
+            gcmkVERIFY_OK(gckHARDWARE_Destroy(Kernel->hardware));
+        }
     }
 
     if (Kernel->atomClients)