summaryrefslogtreecommitdiffstats
path: root/src/amd/common/sid.h
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-11-13 16:35:59 +0100
committerMarek Olšák <[email protected]>2019-06-03 20:05:20 -0400
commitcd247cf45648159cb2676e88108ec8d8dc97095b (patch)
tree5c84086b1b22fc786a9218d0b813b38a1b20b7dd /src/amd/common/sid.h
parentef6ef098af63ab26b1a050be14e76de6d0f48dd2 (diff)
amd/common: cleanup DATA_FORMAT/NUM_FORMAT field names
The field layout wasn't actually changed in gfx9, so having the suffix isn't very useful. The field *contents* were changed, but this is reflected in the V_xxx_xxx definitions and is taken into account by the ac_debug logic based on the register JSON. This aligns the definitions with what will be generated from the register JSON.
Diffstat (limited to 'src/amd/common/sid.h')
-rw-r--r--src/amd/common/sid.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h
index 3c0b7001d2b..6e818f9af1b 100644
--- a/src/amd/common/sid.h
+++ b/src/amd/common/sid.h
@@ -2129,9 +2129,9 @@
#define S_008F14_MIN_LOD(x) (((unsigned)(x) & 0xFFF) << 8)
#define G_008F14_MIN_LOD(x) (((x) >> 8) & 0xFFF)
#define C_008F14_MIN_LOD 0xFFF000FF
-#define S_008F14_DATA_FORMAT_GFX6(x) (((unsigned)(x) & 0x3F) << 20)
-#define G_008F14_DATA_FORMAT_GFX6(x) (((x) >> 20) & 0x3F)
-#define C_008F14_DATA_FORMAT_GFX6 0xFC0FFFFF
+#define S_008F14_DATA_FORMAT(x) (((unsigned)(x) & 0x3F) << 20)
+#define G_008F14_DATA_FORMAT(x) (((x) >> 20) & 0x3F)
+#define C_008F14_DATA_FORMAT 0xFC0FFFFF
#define V_008F14_IMG_DATA_FORMAT_INVALID 0x00
#define V_008F14_IMG_DATA_FORMAT_8 0x01
#define V_008F14_IMG_DATA_FORMAT_16 0x02
@@ -2196,9 +2196,9 @@
#define V_008F14_IMG_DATA_FORMAT_32_AS_8 0x3D /* not on stoney */
#define V_008F14_IMG_DATA_FORMAT_32_AS_8_8 0x3E /* not on stoney */
#define V_008F14_IMG_DATA_FORMAT_32_AS_32_32_32_32 0x3F
-#define S_008F14_NUM_FORMAT_GFX6(x) (((unsigned)(x) & 0x0F) << 26)
-#define G_008F14_NUM_FORMAT_GFX6(x) (((x) >> 26) & 0x0F)
-#define C_008F14_NUM_FORMAT_GFX6 0xC3FFFFFF
+#define S_008F14_NUM_FORMAT(x) (((unsigned)(x) & 0x0F) << 26)
+#define G_008F14_NUM_FORMAT(x) (((x) >> 26) & 0x0F)
+#define C_008F14_NUM_FORMAT 0xC3FFFFFF
#define V_008F14_IMG_NUM_FORMAT_UNORM 0x00
#define V_008F14_IMG_NUM_FORMAT_SNORM 0x01
#define V_008F14_IMG_NUM_FORMAT_USCALED 0x02