rockchip:midgard:update to r4p1_01dev0

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / midgard / mali_kbase_pm_driver.c

diff --git a/drivers/gpu/arm/midgard/mali_kbase_pm_driver.c b/drivers/gpu/arm/midgard/mali_kbase_pm_driver.c
index 1a8cdacd50eda36a67718185649702955fa3932a..9fe788b630eb54b4a1631fe6ad1693717b75b798 100755 (executable)
--- a/drivers/gpu/arm/midgard/mali_kbase_pm_driver.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_pm_driver.c
@@ -655,16 +655,16 @@ void kbase_pm_clock_on(kbase_device *kbdev, mali_bool is_resume)
                        reset_required = MALI_TRUE;
        }
 
+       spin_lock_irqsave(&kbdev->pm.gpu_powered_lock, flags);
+       kbdev->pm.gpu_powered = MALI_TRUE;
+       spin_unlock_irqrestore(&kbdev->pm.gpu_powered_lock, flags);
+
        if (reset_required) {
                /* GPU state was lost, reset GPU to ensure it is in a
                 * consistent state */
                kbase_pm_init_hw(kbdev, MALI_TRUE);
        }
 
-       spin_lock_irqsave(&kbdev->pm.gpu_powered_lock, flags);
-       kbdev->pm.gpu_powered = MALI_TRUE;
-       spin_unlock_irqrestore(&kbdev->pm.gpu_powered_lock, flags);
-
        /* Lastly, enable the interrupts */
        kbase_pm_enable_interrupts(kbdev);
 }