From 0634cdd84f904f80a1cb17fe869996a178ff59ab Mon Sep 17 00:00:00 2001 From: Loren Huang Date: Thu, 16 Jan 2014 16:28:54 +0800 Subject: [PATCH] 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 Acked-by: Shawn Guo (cherry picked from commit 0279fa8984dac78c289d264450c76e1156b3ac79) --- drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c | 4 ++-- drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h | 0 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h 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 old mode 100755 new mode 100644 -- 2.39.5