radv: only sync CP DMA for transfer operations or bottom pipe
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 20 Nov 2018 15:41:23 +0000 (16:41 +0100)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Wed, 21 Nov 2018 09:03:01 +0000 (10:03 +0100)
CP DMA can only be busy when the driver copies buffers. The
only affected Vulkan commands are vkCmdCopyBuffer() and
vkCmdUpdateBuffer() (because we fallback to a copy depending on
a threshold). Clear operations are currently not concerned
because the driver always syncs after the last DMA operation.

Per the spec, these two operations have to be externally
synchronized with VK_PIPELINE_STAGE_TRANSFER_BIT.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/radv_cmd_buffer.c

index 9fcef5a62d32fba9995ea0067013a22d62663260..f13768b4ada88f578483bb696eb093c476f63596 100644 (file)
@@ -4496,7 +4496,9 @@ radv_barrier(struct radv_cmd_buffer *cmd_buffer,
        /* Make sure CP DMA is idle because the driver might have performed a
         * DMA operation for copying or filling buffers/images.
         */
-       si_cp_dma_wait_for_idle(cmd_buffer);
+       if (info->srcStageMask & (VK_PIPELINE_STAGE_TRANSFER_BIT |
+                                 VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT))
+               si_cp_dma_wait_for_idle(cmd_buffer);
 
        cmd_buffer->state.flush_bits |= dst_flush_bits;
 }
@@ -4553,7 +4555,9 @@ static void write_event(struct radv_cmd_buffer *cmd_buffer,
        /* Make sure CP DMA is idle because the driver might have performed a
         * DMA operation for copying or filling buffers/images.
         */
-       si_cp_dma_wait_for_idle(cmd_buffer);
+       if (stageMask & (VK_PIPELINE_STAGE_TRANSFER_BIT |
+                        VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT))
+               si_cp_dma_wait_for_idle(cmd_buffer);
 
        /* TODO: Emit EOS events for syncing PS/CS stages. */