From 82d00a49638ab70d92eae2a5f9c35ac69c24b921 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 6 Jan 2026 17:37:47 +0100 Subject: [PATCH] radv: fix missing SQTT markers for task+mesh draws Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index f4491420f43..f4957eafa1a 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1666,6 +1666,15 @@ radv_gang_finalize(struct radv_cmd_buffer *cmd_buffer) return radv_finalize_cmd_stream(device, cmd_buffer->gang.cs); } +static void +radv_emit_thread_trace_marker(struct radv_device *device, struct radv_cmd_stream *cs, bool predicate) +{ + radeon_check_space(device->ws, cs->b, 2); + radeon_begin(cs); + radeon_event_write_predicate(V_028A90_THREAD_TRACE_MARKER, predicate); + radeon_end(); +} + static void radv_cmd_buffer_after_draw(struct radv_cmd_buffer *cmd_buffer, enum radv_cmd_flush_bits flags, bool dgc) { @@ -1675,10 +1684,12 @@ radv_cmd_buffer_after_draw(struct radv_cmd_buffer *cmd_buffer, enum radv_cmd_flu struct radv_cmd_stream *cs = radv_get_pm4_cs(cmd_buffer); if (unlikely(device->sqtt.bo) && !dgc) { - radeon_check_space(device->ws, cs->b, 2); - radeon_begin(cs); - radeon_event_write_predicate(V_028A90_THREAD_TRACE_MARKER, cmd_buffer->state.predicating); - radeon_end(); + if (radv_cmdbuf_has_stage(cmd_buffer, MESA_SHADER_TASK)) { + /* For task+mesh draws, the mesh packet always includes the SQTT marker in it. */ + radv_emit_thread_trace_marker(device, cmd_buffer->gang.cs, cmd_buffer->state.predicating); + } else { + radv_emit_thread_trace_marker(device, cmd_buffer->cs, cmd_buffer->state.predicating); + } } if (instance->debug_flags & RADV_DEBUG_SYNC_SHADERS) {