From 34b21fd25ad563c32d1794081bf441565a15d1ef Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Wed, 13 Apr 2022 21:02:55 +0200 Subject: [PATCH] radv: Fix barriers with cp dma We need to wait for cp dma if VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT or VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT are set. Closes: #5911 Fixes: 4b9bc4791b5 ("radv: only sync CP DMA for transfer operations or bottom pipe") Signed-off-by: Konstantin Seurer Reviewed-by: Bas Nieuwenhuizen (cherry picked from commit bbdf22ce136a7f02a8bd6c7e646d12a7e10db18d) Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 0dfabfdd97a..a86414a5971 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -8359,16 +8359,10 @@ radv_barrier(struct radv_cmd_buffer *cmd_buffer, const VkDependencyInfoKHR *dep_ /* Make sure CP DMA is idle because the driver might have performed a * DMA operation for copying or filling buffers/images. */ - if (src_stage_mask & (VK_PIPELINE_STAGE_2_COPY_BIT_KHR | - VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR | - VK_PIPELINE_STAGE_2_BLIT_BIT_KHR | - VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR)) { - /* Be conservative for now. */ - src_stage_mask |= VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR; - } - - if (src_stage_mask & (VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR | - VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR)) + if (src_stage_mask & + (VK_PIPELINE_STAGE_2_COPY_BIT | VK_PIPELINE_STAGE_2_CLEAR_BIT | + VK_PIPELINE_STAGE_2_TRANSFER_BIT | VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT | + VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT | VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT)) si_cp_dma_wait_for_idle(cmd_buffer); cmd_buffer->state.flush_bits |= dst_flush_bits;