diff options
| author | Loren Huang <b02279@freescale.com> | 2014-01-16 16:28:54 +0800 |
|---|---|---|
| committer | Loren Huang <b02279@freescale.com> | 2014-01-16 18:39:14 +0800 |
| commit | 0634cdd84f904f80a1cb17fe869996a178ff59ab (patch) | |
| tree | 710cee878a9845f426b0539eb97f2d8a3ec4047c /drivers | |
| parent | 4396407406499bf256bf2489dd52ea0228a6d531 (diff) | |
ENGR00295218-3 gpu:Remove a potential deadlock in gpu vg kernel.
-If _FlushMMU() return error, commitMutex and powerSemaphore will be
locked forever.
-Correct file attribute for gc_hal_base.h
Date: Jan 15, 2014
Signed-off-by: Loren Huang <b02279@freescale.com>
Acked-by: Shawn Guo
(cherry picked from commit 0279fa8984dac78c289d264450c76e1156b3ac79)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c index 1a7c34022fbe..ce2c18a102b6 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c @@ -3430,10 +3430,10 @@ gckVGCOMMAND_Commit( break; } - gcmkERR_BREAK(_FlushMMU(Command)); - do { + gcmkERR_BREAK(_FlushMMU(Command)); + /* Assign a context ID if not yet assigned. */ if (Context->id == 0) { diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h index 375a8f5b03d1..375a8f5b03d1 100755..100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h |