drm/msm: Adjust a7xx GBIF debugbus dumping

Use the kgsl-style list of indices, because this is about to change for
a750 and we want to reuse the downstream header directly.
Patchwork: https://patchwork.freedesktop.org/patch/592520/

Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
Patchwork: https://patchwork.freedesktop.org/patch/592520
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
index 83d7ee01c944ad9c2d7bb3c8f8461b5415e5d1b4..bb0592af41f3e6a5cb4d7f18a6ade9e8706c1bf1 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
@@ -412,7 +412,7 @@ static void a7xx_get_debugbus_blocks(struct msm_gpu *gpu,
 
                for (i = 0; i < ARRAY_SIZE(a7xx_gbif_debugbus_blocks); i++) {
                        a6xx_get_debugbus_block(gpu,
-                               a6xx_state, &a7xx_gbif_debugbus_blocks[i],
+                               a6xx_state, &a7xx_debugbus_blocks[a7xx_gbif_debugbus_blocks[i]],
                                &a6xx_state->debugbus[i + debugbus_blocks_count]);
                }
        }

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h
index 5ddd32063bcc15695abb5b9e25688a0f8a4e6208..3b1ba514e8eef60fc1c13d594edc90bdbef952aa 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h
@@ -517,9 +517,9 @@ static const struct a6xx_debugbus_block a650_debugbus_blocks[] = {
        DEBUGBUS(A6XX_DBGBUS_SPTP_5, 0x100),
 };
 
-static const struct a6xx_debugbus_block a7xx_gbif_debugbus_blocks[] = {
-       DEBUGBUS(A7XX_DBGBUS_GBIF_CX, 0x100),
-       DEBUGBUS(A7XX_DBGBUS_GBIF_GX, 0x100),
+static const u32 a7xx_gbif_debugbus_blocks[] = {
+       A7XX_DBGBUS_GBIF_CX,
+       A7XX_DBGBUS_GBIF_GX,
 };
 
 static const struct a6xx_debugbus_block a7xx_cx_debugbus_blocks[] = {