Merge "msm: kgsl: Run the idle timer while the GPU is not power collapsed"
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index f53d6c8..750eddb 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -1440,7 +1440,8 @@
/* Enable state before turning on irq */
kgsl_pwrctrl_set_state(device, KGSL_STATE_ACTIVE);
kgsl_pwrctrl_irq(device, KGSL_PWRFLAGS_ON);
-
+ mod_timer(&device->idle_timer, jiffies +
+ device->pwrctrl.interval_timeout);
pm_qos_update_request(&device->pwrctrl.pm_qos_req_dma,
device->pwrctrl.pm_qos_latency);
case KGSL_STATE_ACTIVE:
@@ -1543,9 +1544,6 @@
wait_for_completion(&device->hwaccess_gate);
mutex_lock(&device->mutex);
- /* Stop the idle timer */
- del_timer_sync(&device->idle_timer);
-
ret = kgsl_pwrctrl_wake(device);
}
if (ret == 0)