From 19e0195ddc92b9a4d7fde2feb36c5fd9a0a2f8be Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Thu, 26 Apr 2018 23:33:37 +0800 Subject: [PATCH] MGS-3848-5 [#imx-854] OCL1.2: test_image_streams failures there are 2 test failed on 8QXP FB. CL151757 fixed bug #20196, for image objects using host ptr, set the cacheable flag correctly. merged CL151774 fix build error cause by CL151757. Signed-off-by: Xianzhong (cherry picked from commit 0be7546b8798645cea95e7dc935c43380f763458) --- drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c | 1 - drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 92d43ca7aa3c..03bd3c724232 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 @@ -2217,7 +2217,6 @@ gckEVENT_Notify( #if gcdUSE_MMU_EXCEPTION #if gcdALLOC_ON_FAULT status = gckHARDWARE_HandleFault(Event->kernel->hardware); - #endif if (gcmIS_ERROR(status)) { diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h index 983cd3346e63..9a4328fd19a6 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h @@ -1175,6 +1175,14 @@ typedef enum _gceSURF_FORMAT } gceSURF_FORMAT; +typedef enum _gceIMAGE_MEM_TYPE +{ + gcvIMAGE_MEM_DEFAULT, + gcvIMAGE_MEM_HOST_PTR, + gcvIMAGE_MEM_HOST_PTR_UNCACHED, +} +gceIMAGE_MEM_TYPE; + typedef enum _gceSURF_YUV_COLOR_SPACE { gcvSURF_ITU_REC601, @@ -2168,4 +2176,3 @@ typedef void * gctTHREAD; #endif #endif /* __gc_hal_enum_h_ */ - -- 2.17.1