summaryrefslogtreecommitdiff
path: root/drivers/gpu/msm/kgsl_pwrctrl.c
diff options
context:
space:
mode:
authorArchana Sriram <apsrir@codeaurora.org>2018-10-17 11:51:09 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2018-11-01 23:49:07 -0700
commit3e3bb6e7bbd525f040af649af355102a6834b3b7 (patch)
tree5926c73b1685f737f048cc03639244ee207bfd77 /drivers/gpu/msm/kgsl_pwrctrl.c
parent0773fb50d426e9b02b812f9941726741273a279f (diff)
msm: kgsl: Correct the state transitions in suspend function
GPU should not be forced to SUSPEND state when it is in INIT or NONE state as this transition is invalid. Change-Id: Ia3d0fd131348508fe34c57f271c1f991a98afa19 Signed-off-by: Archana Sriram <apsrir@codeaurora.org>
Diffstat (limited to 'drivers/gpu/msm/kgsl_pwrctrl.c')
-rw-r--r--drivers/gpu/msm/kgsl_pwrctrl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index b5476b06176a..b1b0b69d55ba 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -2785,7 +2785,7 @@ static int _suspend(struct kgsl_device *device)
if ((device->state == KGSL_STATE_NONE) ||
(device->state == KGSL_STATE_INIT) ||
(device->state == KGSL_STATE_SUSPEND))
- goto done;
+ return ret;
/* drain to prevent from more commands being submitted */
device->ftbl->drain(device);
@@ -2802,7 +2802,6 @@ static int _suspend(struct kgsl_device *device)
if (ret)
goto err;
-done:
kgsl_pwrctrl_set_state(device, KGSL_STATE_SUSPEND);
return ret;