From: Matt Roper Date: Wed, 11 Mar 2026 23:04:58 +0000 (-0700) Subject: drm/xe: Include running dword offset in default_lrc dumps X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65fcf19cb36bf43c893c3444d5bd120006cb843d;p=thirdparty%2Fkernel%2Flinux.git drm/xe: Include running dword offset in default_lrc dumps Printing a running dword offset in the default_lrc_* debugfs entries makes it easier for developers to find the right offsets to use in regs/xe_lrc_layout.h and/or compare the default LRC contents against the bspec-documented LRC layout. Reviewed-by: Dnyaneshwar Bhadane Link: https://patch.msgid.link/20260311-default_lrc_offsets-v1-1-58d8ed3aa081@intel.com Signed-off-by: Matt Roper --- diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c index 73a503d88217e..7fb59386d1c50 100644 --- a/drivers/gpu/drm/xe/xe_lrc.c +++ b/drivers/gpu/drm/xe/xe_lrc.c @@ -1902,6 +1902,7 @@ static int instr_dw(u32 cmd_header) static int dump_mi_command(struct drm_printer *p, struct xe_gt *gt, + u32 *start, u32 *dw, int remaining_dw) { @@ -1917,15 +1918,18 @@ static int dump_mi_command(struct drm_printer *p, while (num_noop < remaining_dw && (*(++dw) & REG_GENMASK(31, 23)) == MI_NOOP) num_noop++; - drm_printf(p, "[%#010x] MI_NOOP (%d dwords)\n", inst_header, num_noop); + drm_printf(p, "LRC[%#5lx] = [%#010x] MI_NOOP (%d dwords)\n", + dw - num_noop - start, inst_header, num_noop); return num_noop; case MI_TOPOLOGY_FILTER: - drm_printf(p, "[%#010x] MI_TOPOLOGY_FILTER\n", inst_header); + drm_printf(p, "LRC[%#5lx] = [%#010x] MI_TOPOLOGY_FILTER\n", + dw - start, inst_header); return 1; case MI_BATCH_BUFFER_END: - drm_printf(p, "[%#010x] MI_BATCH_BUFFER_END\n", inst_header); + drm_printf(p, "LRC[%#5lx] = [%#010x] MI_BATCH_BUFFER_END\n", + dw - start, inst_header); /* Return 'remaining_dw' to consume the rest of the LRC */ return remaining_dw; } @@ -1939,39 +1943,43 @@ static int dump_mi_command(struct drm_printer *p, switch (inst_header & MI_OPCODE) { case MI_LOAD_REGISTER_IMM: - drm_printf(p, "[%#010x] MI_LOAD_REGISTER_IMM: %d regs\n", - inst_header, (numdw - 1) / 2); + drm_printf(p, "LRC[%#5lx] = [%#010x] MI_LOAD_REGISTER_IMM: %d regs\n", + dw - start, inst_header, (numdw - 1) / 2); for (int i = 1; i < numdw; i += 2) - drm_printf(p, " - %#6x = %#010x\n", dw[i], dw[i + 1]); + drm_printf(p, "LRC[%#5lx] = - %#6x = %#010x\n", + &dw[i] - start, dw[i], dw[i + 1]); return numdw; case MI_LOAD_REGISTER_MEM & MI_OPCODE: - drm_printf(p, "[%#010x] MI_LOAD_REGISTER_MEM: %s%s\n", - inst_header, + drm_printf(p, "LRC[%#5lx] = [%#010x] MI_LOAD_REGISTER_MEM: %s%s\n", + dw - start, inst_header, dw[0] & MI_LRI_LRM_CS_MMIO ? "CS_MMIO " : "", dw[0] & MI_LRM_USE_GGTT ? "USE_GGTT " : ""); if (numdw == 4) - drm_printf(p, " - %#6x = %#010llx\n", + drm_printf(p, "LRC[%#5lx] = - %#6x = %#010llx\n", + dw - start, dw[1], ((u64)(dw[3]) << 32 | (u64)(dw[2]))); else - drm_printf(p, " - %*ph (%s)\n", - (int)sizeof(u32) * (numdw - 1), dw + 1, - numdw < 4 ? "truncated" : "malformed"); + drm_printf(p, "LRC[%#5lx] = - %*ph (%s)\n", + dw - start, (int)sizeof(u32) * (numdw - 1), + dw + 1, numdw < 4 ? "truncated" : "malformed"); return numdw; case MI_FORCE_WAKEUP: - drm_printf(p, "[%#010x] MI_FORCE_WAKEUP\n", inst_header); + drm_printf(p, "LRC[%#5lx] = [%#010x] MI_FORCE_WAKEUP\n", + dw - start, inst_header); return numdw; default: - drm_printf(p, "[%#010x] unknown MI opcode %#x, likely %d dwords\n", - inst_header, opcode, numdw); + drm_printf(p, "LRC[%#5lx] = [%#010x] unknown MI opcode %#x, likely %d dwords\n", + dw - start, inst_header, opcode, numdw); return numdw; } } static int dump_gfxpipe_command(struct drm_printer *p, struct xe_gt *gt, + u32 *start, u32 *dw, int remaining_dw) { @@ -1990,11 +1998,13 @@ static int dump_gfxpipe_command(struct drm_printer *p, switch (*dw & GFXPIPE_MATCH_MASK) { #define MATCH(cmd) \ case cmd: \ - drm_printf(p, "[%#010x] " #cmd " (%d dwords)\n", *dw, numdw); \ + drm_printf(p, "LRC[%#5lx] = [%#010x] " #cmd " (%d dwords)\n", \ + dw - start, *dw, numdw); \ return numdw #define MATCH3D(cmd) \ case CMD_##cmd: \ - drm_printf(p, "[%#010x] " #cmd " (%d dwords)\n", *dw, numdw); \ + drm_printf(p, "LRC[%#5lx] = [%#010x] " #cmd " (%d dwords)\n", \ + dw - start, *dw, numdw); \ return numdw MATCH(STATE_BASE_ADDRESS); @@ -2126,14 +2136,15 @@ static int dump_gfxpipe_command(struct drm_printer *p, MATCH3D(3DSTATE_SLICE_TABLE_STATE_POINTER_2); default: - drm_printf(p, "[%#010x] unknown GFXPIPE command (pipeline=%#x, opcode=%#x, subopcode=%#x), likely %d dwords\n", - *dw, pipeline, opcode, subopcode, numdw); + drm_printf(p, "LRC[%#5lx] = [%#010x] unknown GFXPIPE command (pipeline=%#x, opcode=%#x, subopcode=%#x), likely %d dwords\n", + dw - start, *dw, pipeline, opcode, subopcode, numdw); return numdw; } } static int dump_gfx_state_command(struct drm_printer *p, struct xe_gt *gt, + u32 *start, u32 *dw, int remaining_dw) { @@ -2151,8 +2162,8 @@ static int dump_gfx_state_command(struct drm_printer *p, MATCH(STATE_WRITE_INLINE); default: - drm_printf(p, "[%#010x] unknown GFX_STATE command (opcode=%#x), likely %d dwords\n", - *dw, opcode, numdw); + drm_printf(p, "LRC[%#5lx] = [%#010x] unknown GFX_STATE command (opcode=%#x), likely %d dwords\n", + dw - start, *dw, opcode, numdw); return numdw; } } @@ -2161,7 +2172,7 @@ void xe_lrc_dump_default(struct drm_printer *p, struct xe_gt *gt, enum xe_engine_class hwe_class) { - u32 *dw; + u32 *dw, *start; int remaining_dw, num_dw; if (!gt->default_lrc[hwe_class]) { @@ -2174,18 +2185,20 @@ void xe_lrc_dump_default(struct drm_printer *p, * hardware status page. */ dw = gt->default_lrc[hwe_class] + LRC_PPHWSP_SIZE; + start = dw; remaining_dw = (xe_gt_lrc_size(gt, hwe_class) - LRC_PPHWSP_SIZE) / 4; while (remaining_dw > 0) { if ((*dw & XE_INSTR_CMD_TYPE) == XE_INSTR_MI) { - num_dw = dump_mi_command(p, gt, dw, remaining_dw); + num_dw = dump_mi_command(p, gt, start, dw, remaining_dw); } else if ((*dw & XE_INSTR_CMD_TYPE) == XE_INSTR_GFXPIPE) { - num_dw = dump_gfxpipe_command(p, gt, dw, remaining_dw); + num_dw = dump_gfxpipe_command(p, gt, start, dw, remaining_dw); } else if ((*dw & XE_INSTR_CMD_TYPE) == XE_INSTR_GFX_STATE) { - num_dw = dump_gfx_state_command(p, gt, dw, remaining_dw); + num_dw = dump_gfx_state_command(p, gt, start, dw, remaining_dw); } else { num_dw = min(instr_dw(*dw), remaining_dw); - drm_printf(p, "[%#10x] Unknown instruction of type %#x, likely %d dwords\n", + drm_printf(p, "LRC[%#5lx] = [%#10x] Unknown instruction of type %#x, likely %d dwords\n", + dw - start, *dw, REG_FIELD_GET(XE_INSTR_CMD_TYPE, *dw), num_dw); }