From: Chenyan Feng <ella.feng@nxp.com>
Date: Tue, 24 Apr 2018 15:13:42 +0000 (+0800)
Subject: MGS-3832 [#imx-921] Fix the cl_convolution of ACL which cause MMU exception
X-Git-Tag: C0P2-H0.0--20200415~56
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=4d1ddd5d8e6396abab8264fe45ba725c05f0761c;p=linux.git

MGS-3832 [#imx-921] Fix the cl_convolution of ACL which cause MMU exception

Dump the error info only when there is an error. If the gcdALLOC_ON_FAULT is not enabled, still need to check
the HW status to decide whether to dump the exception info or not

Signed-off-by: Ella Feng <ella.feng@nxp.com>
Reviewed-by: Xianzhong Li <xianzhong.li@nxp.com>
---

diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
index 1246fe04e572..7a3e6edb3aeb 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
@@ -2215,8 +2215,8 @@ gckEVENT_Notify(
 #if gcdALLOC_ON_FAULT
             status = gckHARDWARE_HandleFault(Event->kernel->hardware);
 
-            if (gcmIS_ERROR(status))
 #endif
+            if (gcmIS_ERROR(status))
             {
                 /* Dump error is fault can't be handle. */
                 gckHARDWARE_DumpMMUException(Event->kernel->hardware);