Skip to content

Commit

Permalink
drm/msm/gpu: Fix crash during system suspend after unbind
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Akhil P Oommen authored and robclark committed Sep 30, 2022
1 parent ec8f181 commit 76efc24
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/gpu/drm/msm/adreno/adreno_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -700,7 +703,12 @@ static int adreno_system_suspend(struct device *dev)

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);
}

Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/msm/msm_gpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -997,4 +997,6 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)
}

msm_devfreq_cleanup(gpu);

platform_set_drvdata(gpu->pdev, NULL);
}
4 changes: 4 additions & 0 deletions drivers/gpu/drm/msm/msm_gpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@ struct msm_gpu {
static inline struct msm_gpu *dev_to_gpu(struct device *dev)
{
struct adreno_smmu_priv *adreno_smmu = dev_get_drvdata(dev);

if (!adreno_smmu)
return NULL;

return container_of(adreno_smmu, struct msm_gpu, adreno_smmu);
}

Expand Down

0 comments on commit 76efc24

Please sign in to comment.