From 58cd24a63619d2b318da5397f2aa9055dc514845 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 2 Apr 2024 17:26:02 +0200 Subject: [PATCH] radv: move radv_queue_ring() to radv_queue.c Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_private.h | 12 ------------ src/amd/vulkan/radv_queue.c | 8 ++++++++ src/amd/vulkan/radv_queue.h | 2 ++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index bf12b7cdb70..88ae3f17f8e 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -286,18 +286,6 @@ void llvm_compile_shader(const struct radv_nir_compiler_options *options, const unsigned shader_count, struct nir_shader *const *shaders, struct radv_shader_binary **binary, const struct radv_shader_args *args); -/* - * Queue helper to get ring. - * placed here as it needs queue + device structs. - */ -static inline enum amd_ip_type -radv_queue_ring(const struct radv_queue *queue) -{ - struct radv_device *device = radv_queue_device(queue); - const struct radv_physical_device *pdev = radv_device_physical(device); - return radv_queue_family_to_ring(pdev, queue->state.qf); -} - #define RADV_FROM_HANDLE(__radv_type, __name, __handle) VK_FROM_HANDLE(__radv_type, __name, __handle) #ifdef __cplusplus diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c index 7482d56e6a0..eb57bb88b61 100644 --- a/src/amd/vulkan/radv_queue.c +++ b/src/amd/vulkan/radv_queue.c @@ -1933,3 +1933,11 @@ radv_queue_finish(struct radv_queue *queue) radv_queue_state_finish(&queue->state, device); vk_queue_finish(&queue->vk); } + +enum amd_ip_type +radv_queue_ring(const struct radv_queue *queue) +{ + struct radv_device *device = radv_queue_device(queue); + const struct radv_physical_device *pdev = radv_device_physical(device); + return radv_queue_family_to_ring(pdev, queue->state.qf); +} diff --git a/src/amd/vulkan/radv_queue.h b/src/amd/vulkan/radv_queue.h index bc41c951647..8c296d2000e 100644 --- a/src/amd/vulkan/radv_queue.h +++ b/src/amd/vulkan/radv_queue.h @@ -126,4 +126,6 @@ enum radeon_ctx_priority radv_get_queue_global_priority(const VkDeviceQueueGloba bool radv_queue_internal_submit(struct radv_queue *queue, struct radeon_cmdbuf *cs); +enum amd_ip_type radv_queue_ring(const struct radv_queue *queue); + #endif /* RADV_QUEUE_H */