nir: Properly preserve metadata in more cases

[mesa.git] / src / intel / tools / intel_aub.h

diff --git a/src/intel/tools/intel_aub.h b/src/intel/tools/intel_aub.h
index 9ca548edaf343e3cf578188c8a330ecda6b8d5b7..74ca26ab9bba3ad5f22787b98cc04669e5b87c01 100644 (file)
--- a/src/intel/tools/intel_aub.h
+++ b/src/intel/tools/intel_aub.h
@@ -103,7 +103,7 @@
 /* DW2 */
 
 #define AUB_MEM_TRACE_VERSION_DEVICE_MASK      0x0000ff00
-#define AUB_MEM_TRACE_VERSION_DEVICE_CNL       (15 << 8)
+#define AUB_MEM_TRACE_VERSION_DEVICE_SHIFT      8
 
 #define AUB_MEM_TRACE_VERSION_METHOD_MASK      0x000c0000
 #define AUB_MEM_TRACE_VERSION_METHOD_PHY       (1 << 18)
@@ -117,7 +117,8 @@
 /* DW3 */
 
 #define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_MASK                0xf0000000
-#define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_LOCAL       (1 << 28)
+#define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT                (0 << 28)
+#define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_PHYSICAL    (2 << 28)
 #define AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT_ENTRY  (4 << 28)
 
 /**