diff options
author | Akhil P Oommen <quic_akhilpo@quicinc.com> | 2022-09-28 12:49:00 +0530 |
---|---|---|
committer | Rob Clark <robdclark@chromium.org> | 2022-09-30 09:01:41 -0700 |
commit | 76efc2453d0e8e5d6692ef69981b183ad674edea (patch) | |
tree | 10185204e51483e8b1804b60f2e352bcdea8df64 /drivers/gpu/drm/msm/adreno/adreno_device.c | |
parent | ec8f1813bf8d0737898f99a8c1c69df0cde0d7dd (diff) | |
download | linux-stable-76efc2453d0e8e5d6692ef69981b183ad674edea.tar.gz linux-stable-76efc2453d0e8e5d6692ef69981b183ad674edea.tar.bz2 linux-stable-76efc2453d0e8e5d6692ef69981b183ad674edea.zip |
drm/msm/gpu: Fix crash during system suspend after unbind
In adreno_unbind, we should clean up gpu device's drvdata to avoid
accessing a stale pointer during system suspend. Also, check for NULL
ptr in both system suspend/resume callbacks.
Signed-off-by: Akhil P Oommen <quic_akhilpo@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/505075/
Link: https://lore.kernel.org/r/20220928124830.2.I5ee0ac073ccdeb81961e5ec0cce5f741a7207a71@changeid
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/adreno_device.c')
-rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_device.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 24b489b6129a..628806423f7d 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -679,6 +679,9 @@ static int adreno_system_suspend(struct device *dev) struct msm_gpu *gpu = dev_to_gpu(dev); int remaining, ret; + if (!gpu) + return 0; + suspend_scheduler(gpu); remaining = wait_event_timeout(gpu->retire_event, @@ -700,7 +703,12 @@ out: static int adreno_system_resume(struct device *dev) { - resume_scheduler(dev_to_gpu(dev)); + struct msm_gpu *gpu = dev_to_gpu(dev); + + if (!gpu) + return 0; + + resume_scheduler(gpu); return pm_runtime_force_resume(dev); } |