drm/msm: Fix a6xx GMU shutdown sequence
Subsystems (4)
PATCH 1/1 drm/msm: Fix a6xx GMU shutdown sequence
Commit e812744c5f95 ("drm: msm: a6xx: Add support for A618") missed updating the VBIF flush in a6xx_gmu_shutdown and instead inserted the new sequence into a6xx_pm_suspend along with a redundant GMU idle.
Move a6xx_bus_clear_pending_transactions to a6xx_gmu.c and use it in the appropriate place in the shutdown routine and remove the redundant idle call.
---
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 36 +++++++++++++++++++++++++---- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 43 ----------------------------------- 2 files changed, 31 insertions(+), 48 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +31 -5
@@ -796,6 +796,36 @@ bool a6xx_gmu_isidle(struct a6xx_gmu *gmu)return true; } +#define GBIF_CLIENT_HALT_MASK BIT(0) +#define GBIF_ARB_HALT_MASK BIT(1) + +static void a6xx_bus_clear_pending_transactions (struct adreno_gpu *adreno_gpu) +{ +struct msm_gpu *gpu = &adreno_gpu->base; + +if (!a6xx_has_gbif (adreno_gpu)) { +gpu_write (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL0 ,0xf ); +spin_until ((gpu_read (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL1 ) & +0xf ) ==0xf ); +gpu_write (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL0 ,0 ); + +return ; + } + +/* Halt new client requests on GBIF */ +gpu_write (gpu,REG_A6XX_GBIF_HALT ,GBIF_CLIENT_HALT_MASK ); +spin_until ((gpu_read (gpu,REG_A6XX_GBIF_HALT_ACK ) & + (GBIF_CLIENT_HALT_MASK )) ==GBIF_CLIENT_HALT_MASK ); + +/* Halt all AXI requests on GBIF */ +gpu_write (gpu,REG_A6XX_GBIF_HALT ,GBIF_ARB_HALT_MASK ); +spin_until ((gpu_read (gpu,REG_A6XX_GBIF_HALT_ACK ) & + (GBIF_ARB_HALT_MASK )) ==GBIF_ARB_HALT_MASK ); + +/* The GBIF halt needs to be explicitly cleared */ +gpu_write (gpu,REG_A6XX_GBIF_HALT ,0x0 ); +} +/* Gracefully try to shut down the GMU and by extension the GPU */ static void a6xx_gmu_shutdown (struct a6xx_gmu *gmu) {
@@ -819,11 +849,7 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu)return ; } -/* Clear the VBIF pipe before shutting down */ -gpu_write (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL0 ,0xf ); -spin_until ((gpu_read (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL1 ) &0xf ) - ==0xf ); -gpu_write (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL0 ,0 ); +a6xx_bus_clear_pending_transactions (adreno_gpu);/* tell the GMU we want to slumber */ a6xx_gmu_notify_slumber (gmu);
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +0 -43
55 lines not on this page · raw message
Signature · 1 line
2.7.4
Hi Jordan,
Quoted 27 lines · Jordan Crouse
Commit
e812744c5f95("drm: msm: a6xx: Add support for A618") missed updating the VBIF flush ina6xx_gmu_shutdownand instead inserted the new sequence intoa6xx_pm_suspendalong with a redundant GMU idle.Move
a6xx_bus_clear_pending_transactionstoa6xx_gmu.cand use it in the appropriate place in the shutdown routine and remove the redundant idle call.Signed-off-by Jordan Crouse <[email protected]>---
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 36 +++++++++++++++++++++++++---- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 43 ----------------------------------- 2 files changed, 31 insertions(+), 48 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +0
-0/* Gracefully try to shut down the GMU and by extension the GPU */ static void a6xx_gmu_shutdown (struct a6xx_gmu *gmu) {
drivers/gpu/drm/msm/adreno/a6xx_gmu.c static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu) · line 852
Quoted 9 lines
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +1
-5@@ -819,11 +849,7 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu)return ; } -/* Clear the VBIF pipe before shutting down */ -gpu_write (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL0 ,0xf ); -spin_until ((gpu_read (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL1 ) &0xf ) - ==0xf ); -gpu_write (gpu,REG_A6XX_VBIF_XIN_HALT_CTRL0 ,0 ); +a6xx_bus_clear_pending_transactions (adreno_gpu);
With this the variable 'gpu' isn't used anymore in a6xx_gmu_shutdown(), please remove it.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel