summaryrefslogtreecommitdiff
path: root/drivers/gpu/msm/kgsl_pwrctrl.c
diff options
context:
space:
mode:
authorSuprith Malligere Shankaregowda <supgow@codeaurora.org>2018-03-06 11:51:23 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-14 07:46:40 -0700
commitbf92ce5e7fc3ea65de93bdd745e88286c8cfcf52 (patch)
treedd7a023799b9fab03257c6681260e30d6843ab14 /drivers/gpu/msm/kgsl_pwrctrl.c
parent3e1f25e9559f01dcaf266c4ece9fee779af3e244 (diff)
msm: kgsl: Fix XO shutdown issue
This patch ensures device resumes successfully after XO shutdown without any KGSL error. Change-Id: I9eb8e281bc62793dc7521ba72aaeecf946860851 Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
Diffstat (limited to 'drivers/gpu/msm/kgsl_pwrctrl.c')
-rw-r--r--drivers/gpu/msm/kgsl_pwrctrl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index ff6fae7c739b..b1b0b69d55ba 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -2675,6 +2675,7 @@ _aware(struct kgsl_device *device)
break;
default:
status = -EINVAL;
+ return status;
}
if (status)
kgsl_pwrctrl_request_state(device, KGSL_STATE_NONE);
@@ -2781,8 +2782,9 @@ static int _suspend(struct kgsl_device *device)
{
int ret = 0;
- if ((KGSL_STATE_NONE == device->state) ||
- (KGSL_STATE_INIT == device->state))
+ if ((device->state == KGSL_STATE_NONE) ||
+ (device->state == KGSL_STATE_INIT) ||
+ (device->state == KGSL_STATE_SUSPEND))
return ret;
/* drain to prevent from more commands being submitted */