From: 杜坤明 <dkm@rockchip.com>
Date: Mon, 28 Nov 2011 09:21:15 +0000 (+0800)
Subject: gpu : Prior the cancel_delayed_work_sync to gckOS_AcquireMutex
X-Git-Tag: firefly_0821_release~9733^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=06b726825c44ca7041135562e0fa555939fb9e6b;p=firefly-linux-kernel-4.4.55.git

gpu : Prior the cancel_delayed_work_sync to gckOS_AcquireMutex
---

diff --git a/drivers/staging/rk29/vivante/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c b/drivers/staging/rk29/vivante/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
index 841a39b183a8..1d5c8db7774b 100755
--- a/drivers/staging/rk29/vivante/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
+++ b/drivers/staging/rk29/vivante/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c
@@ -3112,7 +3112,19 @@ gckHARDWARE_SetPowerManagementState(
     default:
         break;
     }
-   
+    
+// dkm: gcdENABLE_LONG_IDLE_POWEROFF
+#if gcdENABLE_LONG_IDLE_POWEROFF
+    if(gcvPOWER_IDLE_BROADCAST==curState) {
+        cancel_delayed_work_sync(&poweroff_work);
+        schedule_delayed_work(&poweroff_work, 5*HZ);
+    } else if(gcvPOWER_OFF_BROADCAST==curState) {
+        // NULL
+    } else {
+        cancel_delayed_work_sync(&poweroff_work);
+    }
+#endif
+
     /* Get current process and thread IDs. */
     gcmkONERROR(gckOS_GetProcessID(&process));
     gcmkONERROR(gckOS_GetThreadID(&thread));
@@ -3169,18 +3181,6 @@ gckHARDWARE_SetPowerManagementState(
     flag  = flags[Hardware->chipPowerState][State];
     clock = clocks[State];
 
-// dkm: gcdENABLE_LONG_IDLE_POWEROFF
-#if gcdENABLE_LONG_IDLE_POWEROFF
-    if(gcvPOWER_IDLE_BROADCAST==curState) {
-        cancel_delayed_work_sync(&poweroff_work);
-        schedule_delayed_work(&poweroff_work, 5*HZ);
-    } else if(gcvPOWER_OFF_BROADCAST==curState) {
-        // NULL
-    } else {
-        cancel_delayed_work_sync(&poweroff_work);
-    }
-#endif
-
     if ((flag == 0) || (Hardware->settingPowerState))
     {
 // dkm: gcdENABLE_LONG_IDLE_POWEROFF