diff options
| author |   Akhil P Oommen <quic_akhilpo@quicinc.com> | 2022-08-19 01:52:15 +0530 |
|---|---|---|
| committer |   Rob Clark <robdclark@chromium.org> | 2022-09-01 08:06:55 -0700 |
| commit | d6463fd4e97545ef4f7069d13a5fa3ac0924dae2 (patch) | |
| tree | 0f3a8f1a66c9d930afd746f74b3b0c05212ecb77 /drivers/gpu/drm/msm | |
| parent | drm/msm/a6xx: Improve gpu recovery sequence (diff) | |
| download | linux-dev-d6463fd4e97545ef4f7069d13a5fa3ac0924dae2.tar.xz linux-dev-d6463fd4e97545ef4f7069d13a5fa3ac0924dae2.zip | |
drm/msm/a6xx: Handle GMU prepare-slumber hfi failure
When prepare-slumber hfi fails, we should follow a6xx_gmu_force_off()
sequence.
Signed-off-by: Akhil P Oommen <quic_akhilpo@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/498401/
Link: https://lore.kernel.org/r/20220819015030.v5.7.I54815c7c36b80d4725cd054e536365250454452f@changeid
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index ec25f19a2985..e033d6a67a20 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1086,7 +1086,11 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu) a6xx_bus_clear_pending_transactions(adreno_gpu); /* tell the GMU we want to slumber */ - a6xx_gmu_notify_slumber(gmu); + ret = a6xx_gmu_notify_slumber(gmu); + if (ret) { + a6xx_gmu_force_off(gmu); + return; + } ret = gmu_poll_timeout(gmu, REG_A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS, val, |