diff options
| author | Xianzhong <b07117@freescale.com> | 2013-11-25 22:41:47 +0800 |
|---|---|---|
| committer | Xianzhong <b07117@freescale.com> | 2013-11-28 22:42:50 +0800 |
| commit | 88ab53302cd114fef41cdd8fd424c984c82f81dd (patch) | |
| tree | 8ab9ba7bdd922fbd27cb5c4ecf4a6916183c3d7f | |
| parent | ce7e0e7b6be6b749041ae81a7bd9ecc23b78ca18 (diff) | |
ENGR00288588 fixed system reboot when run webGL test
this is a fake recovery to cause system reboot, when run
http://people.mozilla.org/~sicking/webgl/ray.html
the fix is to disable GPU recovery in Chrome browser,
Signed-off-by: Xianzhong <b07117@freescale.com>
Acked-by: Jason Liu
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | 4 | ||||
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c | 4 | ||||
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h | 1 |
3 files changed, 5 insertions, 4 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 291da826d91f..88535488b916 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c @@ -1516,12 +1516,12 @@ gckKERNEL_Dispatch( if (hardware) { /* This signal is bound to a hardware, - ** so the timeout is limited by gcdGPU_TIMEOUT. + ** so the timeout is limited by Kernel->timeOut. */ timer += gcdGPU_ADVANCETIMER; } - if (timer >= gcdGPU_TIMEOUT) + if (timer >= Kernel->timeOut) { gcmkONERROR( gckOS_Broadcast(Kernel->os, 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 56ba60a66db1..94593d8e9968 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 @@ -776,13 +776,13 @@ gckEVENT_GetEvent( /* Increment the wait timer. */ timer += 1; - if (timer == gcdGPU_TIMEOUT) + if (timer == Event->kernel->timeOut) { /* Try to call any outstanding events. */ gcmkONERROR(gckHARDWARE_Interrupt(Event->kernel->hardware, gcvTRUE)); } - else if (timer > gcdGPU_TIMEOUT) + else if (timer > Event->kernel->timeOut) { gcmkTRACE_N( gcvLEVEL_ERROR, diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h index 14801aae46db..b44652944c92 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h @@ -1047,6 +1047,7 @@ typedef enum _gcePATCH_ID gcePATCH_CHORME, gcePATCH_DUOKANTV, gcePATCH_TESTAPP, + gcePATCH_GOOGLEEARTH, /* Count enum*/ gcePATCH_COUNT, |