Mesa (main): radv: Fix barriers with cp dma
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Apr 13 22:40:34 UTC 2022
Module: Mesa
Branch: main
Commit: bbdf22ce136a7f02a8bd6c7e646d12a7e10db18d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bbdf22ce136a7f02a8bd6c7e646d12a7e10db18d
Author: Konstantin Seurer <konstantin.seurer at gmail.com>
Date: Wed Apr 13 21:02:55 2022 +0200
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 <konstantin.seurer at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15933>
---
src/amd/vulkan/radv_cmd_buffer.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 8e0f1493fc7..8ab0b5aaacc 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -8452,9 +8452,10 @@ radv_barrier(struct radv_cmd_buffer *cmd_buffer, const VkDependencyInfo *dep_inf
/* 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 |
- VK_PIPELINE_STAGE_2_TRANSFER_BIT |
- VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT))
+ 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;
More information about the mesa-commit
mailing list