summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-11-09 06:19:11 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-11-09 06:19:10 -0800
commit06ff6ccf780f632b28b94614d8cbb961d9af9ce3 (patch)
tree5f0f21fc434d1ec994dece9a934f64ffcb676fa8
parent91c4a617f5221a4e5f4be4912ea86ac0efe6133c (diff)
parent82150f24c0388731f781be2b0425aad3a0d390f4 (diff)
Merge "msm: kgsl: Don't halt dispatcher if device is not in SUSPEND state"
-rw-r--r--drivers/gpu/msm/adreno.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 9cb65033ed13..d2aa0a0f9507 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -2807,7 +2807,8 @@ static void adreno_suspend_device(struct kgsl_device *device,
struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);
int pm_event = pm_state.event;
- adreno_dispatcher_halt(device);
+ if (device->state == KGSL_STATE_SUSPEND)
+ adreno_dispatcher_halt(device);
if ((pm_event == PM_EVENT_FREEZE) ||
(pm_event == PM_EVENT_QUIESCE) ||