Merge "msm: kgsl: Do not allow SLUMBER from INIT" into msm-3.0
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index 8ec9572..c5f5c7b 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -697,6 +697,8 @@
goto slumber;
}
} else if (device->requested_state == KGSL_STATE_SLUMBER) {
+ if (device->state == KGSL_STATE_INIT)
+ return 0;
if (device->ftbl->isidle(device))
goto slumber;
}
@@ -761,7 +763,7 @@
/* Caller must hold the device mutex. */
void kgsl_pwrctrl_wake(struct kgsl_device *device)
{
- if (device->state == KGSL_STATE_SUSPEND)
+ if (device->state & (KGSL_STATE_SUSPEND | KGSL_STATE_INIT))
return;
if (device->state == KGSL_STATE_SLUMBER)