From a5730ef091adfc28b8fd3866bf9a771bff09d8ea Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Thu, 17 Apr 2014 16:23:19 +0800 Subject: ENGR00308898 [#1135] fixed gc400t gpu hang with 5.0.11 Virtual command buffer is forcibly enabled and causes gpu hang on i.MX6SLX - Android GPU hang - X11 GPU hang when run es2gears - Dfb 2D test case df_dok may cause gpu hang. The safe fix is to disable virtual command buffer temporarily Date: Apr 17, 2014 Signed-off-by: Xianzhong Acked-by: Jason Liu (cherry picked from commit f0aaa7521e0e58b4a7c9f104271343ab277fed56) --- drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | 2 +- drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | 2 +- 2 files 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 61ea344c12df..365fe5b28ff6 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c @@ -328,7 +328,7 @@ gckKERNEL_Construct( /* Initialize virtual command buffer. */ /* TODO: Remove platform limitation after porting. */ #if (defined(LINUX) || defined(__QNXNTO__)) - kernel->virtualCommandBuffer = gcvTRUE; + kernel->virtualCommandBuffer = gcvFALSE; #else kernel->virtualCommandBuffer = gcvFALSE; #endif diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h index 58150483bf7c..37141eac8a1a 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h @@ -105,7 +105,7 @@ #define gcdNOWARN 0 #endif -#define gcdUSE_NON_PAGED_MEMORY_CACHE 0 +#define gcdUSE_NON_PAGED_MEMORY_CACHE 10 /******************************************************************************\ ********************************** Structures ********************************** -- cgit v1.2.3