From 1842e17e8be83d5b2d11999cf6c227b435eb94e8 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 17 Dec 2025 19:13:27 +0100 Subject: [PATCH] radv: add the SQTT relocated shaders BO to the cmdbuf list Found this while debugging another thing with amdgpu.debug_mask=0x1 (VM). Cc: mesa-stable Signed-off-by: Samuel Pitoiset (cherry picked from commit 045b778ed6c57bcdd37b60858094c235477ecaa7) Part-of: --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f0c939f72f0..8c1aa884efa 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -834,7 +834,7 @@ "description": "radv: add the SQTT relocated shaders BO to the cmdbuf list", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 7a1cc099c9a..6f984d3b04c 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3967,6 +3967,7 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer) { struct radv_graphics_pipeline *pipeline = cmd_buffer->state.graphics_pipeline; struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); + struct radv_cmd_stream *cs = cmd_buffer->cs; if (cmd_buffer->state.emitted_graphics_pipeline == pipeline) return; @@ -3976,6 +3977,8 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer) if (pipeline->sqtt_shaders_reloc) { /* Emit shaders relocation because RGP requires them to be contiguous in memory. */ radv_sqtt_emit_relocated_shaders(cmd_buffer, pipeline); + + radv_cs_add_buffer(device->ws, cs->b, pipeline->sqtt_shaders_reloc->bo); } if (radv_device_fault_detection_enabled(device))