From 2f364fa240d82cecb40335be6e2dea1ee4994be9 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 2 Jan 2025 17:04:03 +0100 Subject: [PATCH] radv: fix adding the BO to cmdbuf list when emitting buffer markers Found by inspection. Cc: mesa-stable Signed-off-by: Samuel Pitoiset (cherry picked from commit 370e3923130e48366338a514648ada94f62b067d) Part-of: --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 237e1564f39..2e12dccad00 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -284,7 +284,7 @@ "description": "radv: fix adding the BO to cmdbuf list when emitting buffer markers", "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 4b77bd2d709..d08aa5e38d5 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -13617,6 +13617,8 @@ radv_CmdWriteBufferMarker2AMD(VkCommandBuffer commandBuffer, VkPipelineStageFlag struct radeon_cmdbuf *cs = cmd_buffer->cs; const uint64_t va = radv_buffer_get_va(buffer->bo) + buffer->offset + dstOffset; + radv_cs_add_buffer(device->ws, cs, buffer->bo); + if (cmd_buffer->qf == RADV_QUEUE_TRANSFER) { radeon_check_space(device->ws, cmd_buffer->cs, 4); radeon_emit(cmd_buffer->cs, SDMA_PACKET(SDMA_OPCODE_FENCE, 0, SDMA_FENCE_MTYPE_UC));