From d7514c5f0408a3173c5ed10452dd33f7b6220eda Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 28 Feb 2022 15:50:34 +0100 Subject: [PATCH] radv: stop waiting for DMA to be idle for all transfer operations Only copy operations actually use CP DMA. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 534f8077600..3fdd75ea14e 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -8446,18 +8446,11 @@ radv_barrier(struct radv_cmd_buffer *cmd_buffer, const VkDependencyInfoKHR *dep_ &dep_info->pImageMemoryBarriers[i].subresourceRange, sample_locs_info ? &sample_locations : NULL); } - /* Make sure CP DMA is idle because the driver might have performed a - * DMA operation for copying or filling buffers/images. + /* Make sure CP DMA is idle because the driver might have performed a DMA operation for copying a + * buffer (or a MSAA image using FMASK) or updated a buffer which is a transfer operation. */ 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_TRANSFER_BIT_KHR | VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR)) si_cp_dma_wait_for_idle(cmd_buffer);