diff options
| author | Jonathan Marek <jonathan@marek.ca> | 2021-05-13 13:14:00 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2021-06-08 11:26:45 -0700 |
| commit | ce86c239e4d218ae6040bec18e6d19a58edb8b7c (patch) | |
| tree | 1b6f581ad8cc51331183e88a37f2da19eaa317f6 | |
| parent | b4387eaf3821a4c4241ac3a556e13244eb1fdaa5 (diff) | |
| download | linux-ce86c239e4d218ae6040bec18e6d19a58edb8b7c.tar.gz | |
drm/msm/a6xx: avoid shadow NULL reference in failure path
If a6xx_hw_init() fails before creating the shadow_bo, the a6xx_pm_suspend
code referencing it will crash. Change the condition to one that avoids
this problem (note: creation of shadow_bo is behind this same condition)
Fixes: e8b0b994c3a5 ("drm/msm/a6xx: Clear shadow on suspend")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
Link: https://lore.kernel.org/r/20210513171431.18632-6-jonathan@marek.ca
Signed-off-by: Rob Clark <robdclark@chromium.org>
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 37ba111601cdc..f6c1b62b901e2 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -1284,7 +1284,7 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu) if (ret) return ret; - if (adreno_gpu->base.hw_apriv || a6xx_gpu->has_whereami) + if (a6xx_gpu->shadow_bo) for (i = 0; i < gpu->nr_rings; i++) a6xx_gpu->shadow[i] = 0; |