Mesa (main): ac: fix win32 build

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Jul 6 15:04:56 UTC 2021


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul  6 14:07:15 2021 +1000

ac: fix win32 build

Fixes: e2e9dd44f422 ("ac/surface: Handle non-retiled displayable DCC correctly for modifiers.")
Acked-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11725>

---

 src/amd/common/ac_drm_fourcc.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/amd/common/ac_drm_fourcc.h b/src/amd/common/ac_drm_fourcc.h
index 80a76bdf4a8..620080290e0 100644
--- a/src/amd/common/ac_drm_fourcc.h
+++ b/src/amd/common/ac_drm_fourcc.h
@@ -49,6 +49,7 @@ typedef uint64_t __u64;
 #define AMD_FMT_MOD_DCC_BLOCK_64B 0
 #define AMD_FMT_MOD_DCC_BLOCK_128B 1
 #define AMD_FMT_MOD_TILE_VERSION_SHIFT 0
+#define AMD_FMT_MOD_TILE_VERSION_MASK 0xFF
 #define AMD_FMT_MOD_TILE_SHIFT 8
 #define AMD_FMT_MOD_TILE_MASK 0x1F
 #define AMD_FMT_MOD_DCC_SHIFT 13
@@ -68,6 +69,7 @@ typedef uint64_t __u64;
 #define AMD_FMT_MOD_BANK_XOR_BITS_SHIFT 24
 #define AMD_FMT_MOD_PACKERS_SHIFT 27 /* aliases with BANK_XOR_BITS */
 #define AMD_FMT_MOD_RB_SHIFT 30
+#define AMD_FMT_MOD_RB_MASK 0x7
 #define AMD_FMT_MOD_PIPE_SHIFT 33
 #define AMD_FMT_MOD_SET(field, value) \
 	((uint64_t)(value) << AMD_FMT_MOD_##field##_SHIFT)



More information about the mesa-commit mailing list