Skip to content

Commit add1585

Browse files
konradybciorobclark
authored andcommitted
Revert "drm/msm/a6xx: Poll for GBIF unhalt status in hw_init"
Commit f6ebff4fe810 ("drm/msm/adreno: De-spaghettify the use of memory barriers") made some fixups relating to write arrival, ensuring that the GPU's memory interface has *really really really* been told to come out of reset. That in turn rendered the hacky commit being reverted no longer necessary. Get rid of it. This reverts commit b775328 ("drm/msm/a6xx: Poll for GBIF unhalt status in hw_init") Signed-off-by: Konrad Dybcio <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/600870/ Reviewed-by: Akhil P Oommen <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent 43ec1a2 commit add1585

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -867,10 +867,6 @@ static int hw_init(struct msm_gpu *gpu)
867867
gpu_read(gpu, REG_A6XX_RBBM_GBIF_HALT);
868868
}
869869

870-
/* Some GPUs are stubborn and take their sweet time to unhalt GBIF! */
871-
if (adreno_is_a7xx(adreno_gpu) && a6xx_has_gbif(adreno_gpu))
872-
spin_until(!gpu_read(gpu, REG_A6XX_GBIF_HALT_ACK));
873-
874870
gpu_write(gpu, REG_A6XX_RBBM_SECVID_TSB_CNTL, 0);
875871

876872
if (adreno_is_a619_holi(adreno_gpu))

0 commit comments

Comments
 (0)