Mesa (master): amd/common: rename R_3F2_CONTROL to IB_CONTROL for disambiguation

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e04215815e1710450f8e73c798bf073a6ff0c6d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e04215815e1710450f8e73c798bf073a6ff0c6d7

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Mon May  6 14:47:40 2019 +0200

amd/common: rename R_3F2_CONTROL to IB_CONTROL for disambiguation

This "register" name collides with R_370_CONTROL.

This aligns the definitions with what will be generated from the
register JSON.

---

 src/amd/common/ac_debug.c | 2 +-
 src/amd/common/sid.h      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/common/ac_debug.c b/src/amd/common/ac_debug.c
index 18cbeed4515..e08f8132591 100644
--- a/src/amd/common/ac_debug.c
+++ b/src/amd/common/ac_debug.c
@@ -393,7 +393,7 @@ static void ac_parse_packet3(FILE *f, uint32_t header, struct ac_ib_parser *ib,
 		uint32_t base_hi_dw = ac_ib_get(ib);
 		ac_dump_reg(f, ib->chip_class, R_3F1_IB_BASE_HI, base_hi_dw, ~0);
 		uint32_t control_dw = ac_ib_get(ib);
-		ac_dump_reg(f, ib->chip_class, R_3F2_CONTROL, control_dw, ~0);
+		ac_dump_reg(f, ib->chip_class, R_3F2_IB_CONTROL, control_dw, ~0);
 
 		if (!ib->addr_callback)
 			break;
diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h
index 6e818f9af1b..1e6d2595c3c 100644
--- a/src/amd/common/sid.h
+++ b/src/amd/common/sid.h
@@ -153,7 +153,7 @@
 #define PKT3_INDIRECT_BUFFER_CIK               0x3F /* new on CIK */
 #define   R_3F0_IB_BASE_LO                     0x3F0
 #define   R_3F1_IB_BASE_HI                     0x3F1
-#define   R_3F2_CONTROL                        0x3F2
+#define   R_3F2_IB_CONTROL                        0x3F2
 #define     S_3F2_IB_SIZE(x)                   (((unsigned)(x) & 0xfffff) << 0)
 #define     G_3F2_IB_SIZE(x)                   (((unsigned)(x) >> 0) & 0xfffff)
 #define     S_3F2_CHAIN(x)                     (((unsigned)(x) & 0x1) << 20)