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.

diff --git a/src/amd/common/ac_debug.c b/src/amd/common/ac_debug.c
index 18cbeed4515b6dc404b6a6ced6869358bf6e3908..e08f8132591971bd58d744e5c3bc1717fdb63bd2 100644 (file)
--- 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 6e818f9af1be5db2b41cda188086166ad247f012..1e6d2595c3c5f9c2c90da00d64c3d36eca3780ac 100644 (file)
--- 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)