From 87915baa2355e3b0d23f47517fc901b8fffa3b16 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sat, 16 Jun 2018 23:25:12 +0100 Subject: [PATCH] intel: intel_dump_gpu: use simulator id in captures Signed-off-by: Lionel Landwerlin Reviewed-by: Rafael Antognolli --- 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 a9ce109b2b6..6107035d5bc 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.30.2