[Mesa-dev] [PATCH 070/140] radeonsi/gfx9: don't read back non-existent SRBM registers

Marek Olšák maraeo at gmail.com
Mon Mar 20 22:43:20 UTC 2017


From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_debug.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c
index db310b7..1a4cadf 100644
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -176,23 +176,25 @@ static void si_dump_debug_registers(struct si_context *sctx, FILE *f)
 		return;
 	}
 
 	si_dump_mmapped_reg(sctx, f, R_008008_GRBM_STATUS2);
 	si_dump_mmapped_reg(sctx, f, R_008014_GRBM_STATUS_SE0);
 	si_dump_mmapped_reg(sctx, f, R_008018_GRBM_STATUS_SE1);
 	si_dump_mmapped_reg(sctx, f, R_008038_GRBM_STATUS_SE2);
 	si_dump_mmapped_reg(sctx, f, R_00803C_GRBM_STATUS_SE3);
 	si_dump_mmapped_reg(sctx, f, R_00D034_SDMA0_STATUS_REG);
 	si_dump_mmapped_reg(sctx, f, R_00D834_SDMA1_STATUS_REG);
-	si_dump_mmapped_reg(sctx, f, R_000E50_SRBM_STATUS);
-	si_dump_mmapped_reg(sctx, f, R_000E4C_SRBM_STATUS2);
-	si_dump_mmapped_reg(sctx, f, R_000E54_SRBM_STATUS3);
+	if (sctx->b.chip_class <= VI) {
+		si_dump_mmapped_reg(sctx, f, R_000E50_SRBM_STATUS);
+		si_dump_mmapped_reg(sctx, f, R_000E4C_SRBM_STATUS2);
+		si_dump_mmapped_reg(sctx, f, R_000E54_SRBM_STATUS3);
+	}
 	si_dump_mmapped_reg(sctx, f, R_008680_CP_STAT);
 	si_dump_mmapped_reg(sctx, f, R_008674_CP_STALLED_STAT1);
 	si_dump_mmapped_reg(sctx, f, R_008678_CP_STALLED_STAT2);
 	si_dump_mmapped_reg(sctx, f, R_008670_CP_STALLED_STAT3);
 	si_dump_mmapped_reg(sctx, f, R_008210_CP_CPC_STATUS);
 	si_dump_mmapped_reg(sctx, f, R_008214_CP_CPC_BUSY_STAT);
 	si_dump_mmapped_reg(sctx, f, R_008218_CP_CPC_STALLED_STAT1);
 	si_dump_mmapped_reg(sctx, f, R_00821C_CP_CPF_STATUS);
 	si_dump_mmapped_reg(sctx, f, R_008220_CP_CPF_BUSY_STAT);
 	si_dump_mmapped_reg(sctx, f, R_008224_CP_CPF_STALLED_STAT1);
-- 
2.7.4



More information about the mesa-dev mailing list