From 0f66ff242770ba3661e18942331be7bce293b9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Thu, 5 May 2022 18:58:01 +0200 Subject: [PATCH] radv: Move up early exit for transfer queues in radv_get_preamble_cs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf Reviewed-by: Dave Airlie Reviewed-By: Tatsuyuki Ishi Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 3ba1889ea8d..dc7dfd0d583 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -3984,8 +3984,6 @@ radv_get_preamble_cs(struct radv_queue *queue, uint32_t scratch_size_per_wave, bool add_tess_rings = false, add_gds = false, add_gds_oa = false, add_sample_positions = false; uint32_t ring_bo_flags = RADEON_FLAG_NO_CPU_ACCESS | RADEON_FLAG_NO_INTERPROCESS_SHARING; VkResult result = VK_SUCCESS; - if (queue->qf == RADV_QUEUE_TRANSFER) - return VK_SUCCESS; if (!queue->has_tess_rings) { if (needs_tess_rings) @@ -4181,7 +4179,6 @@ radv_get_preamble_cs(struct radv_queue *queue, uint32_t scratch_size_per_wave, case RADV_QUEUE_COMPUTE: radv_init_compute_state(cs, queue); break; - case RADV_QUEUE_TRANSFER: default: break; } @@ -4450,6 +4447,9 @@ radv_get_preambles(struct radv_queue *queue, struct vk_command_buffer *const *cm struct radeon_cmdbuf **initial_preamble_cs, struct radeon_cmdbuf **continue_preamble_cs) { + if (queue->qf == RADV_QUEUE_TRANSFER) + return VK_SUCCESS; + uint32_t scratch_size_per_wave = 0, waves_wanted = 0; uint32_t compute_scratch_size_per_wave = 0, compute_waves_wanted = 0; uint32_t esgs_ring_size = 0, gsvs_ring_size = 0;