radv: Don't use pointers to pointers when updating the preambles.

Instead, just use the pointers from the queue structure.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-By: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16358>

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 0a6ae7c..02691d0 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3963,14 +3963,11 @@ radv_init_compute_state(struct radeon_cmdbuf *cs, struct radv_queue *queue)
 }
 
 static VkResult
-radv_get_preamble_cs(struct radv_queue *queue, uint32_t scratch_size_per_wave,
-                     uint32_t scratch_waves, uint32_t compute_scratch_size_per_wave,
-                     uint32_t compute_scratch_waves, uint32_t esgs_ring_size,
-                     uint32_t gsvs_ring_size, bool needs_tess_rings, bool needs_gds,
-                     bool needs_gds_oa, bool needs_sample_positions,
-                     struct radeon_cmdbuf **initial_full_flush_preamble_cs,
-                     struct radeon_cmdbuf **initial_preamble_cs,
-                     struct radeon_cmdbuf **continue_preamble_cs)
+radv_update_preamble_cs(struct radv_queue *queue, uint32_t scratch_size_per_wave,
+                        uint32_t scratch_waves, uint32_t compute_scratch_size_per_wave,
+                        uint32_t compute_scratch_waves, uint32_t esgs_ring_size,
+                        uint32_t gsvs_ring_size, bool needs_tess_rings, bool needs_gds,
+                        bool needs_gds_oa, bool needs_sample_positions)
 {
    struct radeon_winsys_bo *scratch_bo = queue->scratch_bo;
    struct radeon_winsys_bo *descriptor_bo = queue->descriptor_bo;
@@ -4010,9 +4007,6 @@ radv_get_preamble_cs(struct radv_queue *queue, uint32_t scratch_size_per_wave,
        esgs_ring_size <= queue->esgs_ring_size && gsvs_ring_size <= queue->gsvs_ring_size &&
        !add_tess_rings && !add_gds && !add_gds_oa && !add_sample_positions &&
        queue->initial_preamble_cs) {
-      *initial_full_flush_preamble_cs = queue->initial_full_flush_preamble_cs;
-      *initial_preamble_cs = queue->initial_preamble_cs;
-      *continue_preamble_cs = queue->continue_preamble_cs;
       return VK_SUCCESS;
    }
 
@@ -4277,9 +4271,6 @@ radv_get_preamble_cs(struct radv_queue *queue, uint32_t scratch_size_per_wave,
    if (add_sample_positions)
       queue->has_sample_positions = true;
 
-   *initial_full_flush_preamble_cs = queue->initial_full_flush_preamble_cs;
-   *initial_preamble_cs = queue->initial_preamble_cs;
-   *continue_preamble_cs = queue->continue_preamble_cs;
    return VK_SUCCESS;
 fail:
    for (int i = 0; i < ARRAY_SIZE(dest_cs); ++i)
@@ -4419,10 +4410,8 @@ radv_sparse_image_bind_memory(struct radv_device *device, const VkSparseImageMem
 }
 
 static VkResult
-radv_get_preambles(struct radv_queue *queue, struct vk_command_buffer *const *cmd_buffers,
-                   uint32_t cmd_buffer_count, struct radeon_cmdbuf **initial_full_flush_preamble_cs,
-                   struct radeon_cmdbuf **initial_preamble_cs,
-                   struct radeon_cmdbuf **continue_preamble_cs)
+radv_update_preambles(struct radv_queue *queue, struct vk_command_buffer *const *cmd_buffers,
+                      uint32_t cmd_buffer_count)
 {
    if (queue->qf == RADV_QUEUE_TRANSFER)
       return VK_SUCCESS;
@@ -4451,11 +4440,10 @@ radv_get_preambles(struct radv_queue *queue, struct vk_command_buffer *const *cm
       sample_positions_needed |= cmd_buffer->sample_positions_needed;
    }
 
-   return radv_get_preamble_cs(queue, scratch_size_per_wave, waves_wanted,
-                               compute_scratch_size_per_wave, compute_waves_wanted, esgs_ring_size,
-                               gsvs_ring_size, tess_rings_needed, gds_needed, gds_oa_needed,
-                               sample_positions_needed, initial_full_flush_preamble_cs,
-                               initial_preamble_cs, continue_preamble_cs);
+   return radv_update_preamble_cs(queue, scratch_size_per_wave, waves_wanted,
+                                  compute_scratch_size_per_wave, compute_waves_wanted,
+                                  esgs_ring_size, gsvs_ring_size, tess_rings_needed, gds_needed,
+                                  gds_oa_needed, sample_positions_needed);
 }
 
 struct radv_deferred_queue_submission {
@@ -4536,13 +4524,9 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi
    bool can_patch = true;
    uint32_t advance;
    VkResult result;
-   struct radeon_cmdbuf *initial_preamble_cs = NULL;
-   struct radeon_cmdbuf *initial_flush_preamble_cs = NULL;
-   struct radeon_cmdbuf *continue_preamble_cs = NULL;
 
    result =
-      radv_get_preambles(queue, submission->command_buffers, submission->command_buffer_count,
-                         &initial_flush_preamble_cs, &initial_preamble_cs, &continue_preamble_cs);
+      radv_update_preambles(queue, submission->command_buffers, submission->command_buffer_count);
    if (result != VK_SUCCESS)
       return result;
 
@@ -4570,7 +4554,7 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi
        * before starting the next cmdbuffer, so we need to do it here. */
       bool need_wait = !j && submission->wait_count > 0;
       struct radeon_cmdbuf *initial_preamble =
-         need_wait ? initial_flush_preamble_cs : initial_preamble_cs;
+         need_wait ? queue->initial_full_flush_preamble_cs : queue->initial_preamble_cs;
       advance = MIN2(max_cs_submission, submission->command_buffer_count - j);
       bool last_submit = j + advance == submission->command_buffer_count;
 
@@ -4579,7 +4563,7 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi
 
       result = queue->device->ws->cs_submit(
          ctx, ring, queue->vk.index_in_family, cs_array + j, advance, initial_preamble,
-         continue_preamble_cs, j == 0 ? submission->wait_count : 0, submission->waits,
+         queue->continue_preamble_cs, j == 0 ? submission->wait_count : 0, submission->waits,
          last_submit ? submission->signal_count : 0, submission->signals, can_patch);
 
       if (result != VK_SUCCESS)