diff options
author | Xianzhong <b07117@freescale.com> | 2014-04-17 04:23:19 -0400 |
---|---|---|
committer | Xianzhong <b07117@freescale.com> | 2014-04-21 05:13:48 -0400 |
commit | a5730ef091adfc28b8fd3866bf9a771bff09d8ea (patch) | |
tree | 64d48a16fcd79ece14ee160e3af3889ad898dbf4 /drivers/mxc | |
parent | 629345cf7257b13de99e1c62d193e007946fb566 (diff) |
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 <b07117@freescale.com>
Acked-by: Jason Liu
(cherry picked from commit f0aaa7521e0e58b4a7c9f104271343ab277fed56)
Diffstat (limited to 'drivers/mxc')
-rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | 2 | ||||
-rw-r--r-- | 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( | |||
328 | /* Initialize virtual command buffer. */ | 328 | /* Initialize virtual command buffer. */ |
329 | /* TODO: Remove platform limitation after porting. */ | 329 | /* TODO: Remove platform limitation after porting. */ |
330 | #if (defined(LINUX) || defined(__QNXNTO__)) | 330 | #if (defined(LINUX) || defined(__QNXNTO__)) |
331 | kernel->virtualCommandBuffer = gcvTRUE; | 331 | kernel->virtualCommandBuffer = gcvFALSE; |
332 | #else | 332 | #else |
333 | kernel->virtualCommandBuffer = gcvFALSE; | 333 | kernel->virtualCommandBuffer = gcvFALSE; |
334 | #endif | 334 | #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 @@ | |||
105 | #define gcdNOWARN 0 | 105 | #define gcdNOWARN 0 |
106 | #endif | 106 | #endif |
107 | 107 | ||
108 | #define gcdUSE_NON_PAGED_MEMORY_CACHE 0 | 108 | #define gcdUSE_NON_PAGED_MEMORY_CACHE 10 |
109 | 109 | ||
110 | /******************************************************************************\ | 110 | /******************************************************************************\ |
111 | ********************************** Structures ********************************** | 111 | ********************************** Structures ********************************** |