diff options
| author | Nicolai Hähnle <[email protected]> | 2019-05-07 01:44:52 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-06-03 20:05:20 -0400 |
| commit | cf51009ad26a487243b3404e86c445872ca3ac85 (patch) | |
| tree | 6d18cb8ea5e0c053da199ea774761b42de96a068 /src/amd/common | |
| parent | e04215815e1710450f8e73c798bf073a6ff0c6d7 (diff) | |
amd/common: unify PITCH_GFX6 and PITCH_GFX9
The definition of the fields differs, but PITCH_GFX9 is a mere extension
of PITCH_GFX6 that does not conflict with any other fields.
This aligns the definitions with what will be generated from the
register JSON.
The information about how large the fields really are is preserved in
the register database.
Diffstat (limited to 'src/amd/common')
| -rw-r--r-- | src/amd/common/gfx9d.h | 6 | ||||
| -rw-r--r-- | src/amd/common/sid.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/amd/common/gfx9d.h b/src/amd/common/gfx9d.h index 5d3de5842a1..4aa6821ad64 100644 --- a/src/amd/common/gfx9d.h +++ b/src/amd/common/gfx9d.h @@ -1446,9 +1446,9 @@ #define S_008F20_DEPTH(x) (((unsigned)(x) & 0x1FFF) << 0) #define G_008F20_DEPTH(x) (((x) >> 0) & 0x1FFF) #define C_008F20_DEPTH 0xFFFFE000 -#define S_008F20_PITCH_GFX9(x) (((unsigned)(x) & 0xFFFF) << 13) -#define G_008F20_PITCH_GFX9(x) (((x) >> 13) & 0xFFFF) -#define C_008F20_PITCH_GFX9 0xE0001FFF +#define S_008F20_PITCH(x) (((unsigned)(x) & 0xFFFF) << 13) +#define G_008F20_PITCH(x) (((x) >> 13) & 0xFFFF) +#define C_008F20_PITCH 0xE0001FFF #define S_008F20_BC_SWIZZLE(x) (((unsigned)(x) & 0x07) << 29) #define G_008F20_BC_SWIZZLE(x) (((x) >> 29) & 0x07) #define C_008F20_BC_SWIZZLE 0x1FFFFFFF diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h index 1e6d2595c3c..930e70e8ebd 100644 --- a/src/amd/common/sid.h +++ b/src/amd/common/sid.h @@ -2326,9 +2326,9 @@ #define S_008F20_DEPTH(x) (((unsigned)(x) & 0x1FFF) << 0) #define G_008F20_DEPTH(x) (((x) >> 0) & 0x1FFF) #define C_008F20_DEPTH 0xFFFFE000 -#define S_008F20_PITCH_GFX6(x) (((unsigned)(x) & 0x3FFF) << 13) -#define G_008F20_PITCH_GFX6(x) (((x) >> 13) & 0x3FFF) -#define C_008F20_PITCH_GFX6 0xF8001FFF +#define S_008F20_PITCH(x) (((unsigned)(x) & 0xFFFF) << 13) +#define G_008F20_PITCH(x) (((x) >> 13) & 0xFFFF) +#define C_008F20_PITCH 0xE0001FFF #define R_008F24_SQ_IMG_RSRC_WORD5 0x008F24 #define S_008F24_BASE_ARRAY(x) (((unsigned)(x) & 0x1FFF) << 0) #define G_008F24_BASE_ARRAY(x) (((x) >> 0) & 0x1FFF) |