fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radv: fix potential GPU hangs with secondaries on transfer queue

Browse source 
Cache flushes should be skipped on SDMA. In practice,
radv_emit_cache_flush() should only be called on GFX/ACE.

SDMA NOP packets are emitted in barriers directly.

This fixes recent VKCTS coverage
dEQP-VK.api.command_buffers.secondary_on_transfer_queue.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
(cherry picked from commit c4d5090d69)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40092>
This commit is contained in:
Samuel Pitoiset 2026-02-18 16:25:06 +01:00 • committed by Eric Engestrom
parent 6d7f2e3fbd
commit 87a238d829
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -274,7 +274,7 @@
"description": "radv: fix potential GPU hangs with secondaries on transfer queue",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

13
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -9643,16 +9643,19 @@ radv_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCou
VK_FROM_HANDLE(radv_cmd_buffer, primary, commandBuffer);
struct radv_device *device = radv_cmd_buffer_device(primary);
const struct radv_physical_device *pdev = radv_device_physical(device);
const bool is_gfx_or_ace = primary->qf == RADV_QUEUE_GENERAL || primary->qf == RADV_QUEUE_COMPUTE;
assert(commandBufferCount > 0);
radv_emit_mip_change_flush_default(primary);
if (is_gfx_or_ace) {
radv_emit_mip_change_flush_default(primary);
/* Emit pending flushes on primary prior to executing secondary */
radv_emit_cache_flush(primary);
/* Emit pending flushes on primary prior to executing secondary */
radv_emit_cache_flush(primary);
/* Make sure CP DMA is idle on primary prior to executing secondary. */
radv_cp_dma_wait_for_idle(primary);
/* Make sure CP DMA is idle on primary prior to executing secondary. */
radv_cp_dma_wait_for_idle(primary);
}
for (uint32_t i = 0; i < commandBufferCount; i++) {
VK_FROM_HANDLE(radv_cmd_buffer, secondary, pCmdBuffers[i]);