[Mesa-dev] [PATCH v2 15/16] intel: intel_dump_gpu: use simulator id in captures

[Lionel Landwerlin]

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
---
 src/intel/tools/intel_aub.h      | 2 +-
 src/intel/tools/intel_dump_gpu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/tools/intel_aub.h b/src/intel/tools/intel_aub.h
index 2888515048f..74ca26ab9bb 100644
--- 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)
diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index bfff481ba5e..1dff597401d 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -512,7 +512,7 @@ write_execlists_header(void)
    dwords = 5 + app_name_len / sizeof(uint32_t);
    dword_out(CMD_MEM_TRACE_VERSION | (dwords - 1));
    dword_out(AUB_MEM_TRACE_VERSION_FILE_VERSION);
-   dword_out(AUB_MEM_TRACE_VERSION_DEVICE_CNL);
+   dword_out(devinfo.simulator_id << AUB_MEM_TRACE_VERSION_DEVICE_SHIFT);
    dword_out(0);      /* version */
    dword_out(0);      /* version */
    data_out(app_name, app_name_len);
-- 
2.17.1