From 13b3c469663da0c79d385ce15887f6b5805f060d Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Sun, 6 Dec 2020 17:56:31 +0800 Subject: [PATCH] MGS-6108-3 [#imx-2416] fix gcdENABLE_VG logic issue enable asynchronous unlock even if define gcdENABLE_VG Signed-off-by: Xianzhong --- drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bb50ec0a0554..6d8c1d7633c4 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c @@ -1834,7 +1834,7 @@ _BottomHalfUnlockVideoMemory( gcmkONERROR(gckVIDMEM_NODE_Dereference(Kernel, nodeObject)); } else -#else +#endif { /* Perform asynchronous unlock */ gcmkONERROR(gckEVENT_Unlock(Kernel->eventObj, gcvKERNEL_PIXEL, nodeObject)); @@ -1842,7 +1842,7 @@ _BottomHalfUnlockVideoMemory( /* Submit the event queue. */ gcmkONERROR(gckEVENT_Submit(Kernel->eventObj, gcvTRUE, gcvFALSE)); } -#endif + return gcvSTATUS_OK; OnError: