diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 42af9991f24..db24e523868 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -272,25 +272,6 @@ radv_cmd_buffer_uses_mec(struct radv_cmd_buffer *cmd_buffer) return cmd_buffer->qf == RADV_QUEUE_COMPUTE && pdev->info.gfx_level >= GFX7; } -enum amd_ip_type -radv_queue_family_to_ring(const struct radv_physical_device *pdev, enum radv_queue_family f) -{ - switch (f) { - case RADV_QUEUE_GENERAL: - return AMD_IP_GFX; - case RADV_QUEUE_COMPUTE: - return AMD_IP_COMPUTE; - case RADV_QUEUE_TRANSFER: - return AMD_IP_SDMA; - case RADV_QUEUE_VIDEO_DEC: - return pdev->vid_decode_ip; - case RADV_QUEUE_VIDEO_ENC: - return AMD_IP_VCN_ENC; - default: - unreachable("Unknown queue family"); - } -} - static void radv_write_data(struct radv_cmd_buffer *cmd_buffer, const unsigned engine_sel, const uint64_t va, const unsigned count, const uint32_t *data, const bool predicating) diff --git a/src/amd/vulkan/radv_cmd_buffer.h b/src/amd/vulkan/radv_cmd_buffer.h index ec9f21e6bc9..323299d5466 100644 --- a/src/amd/vulkan/radv_cmd_buffer.h +++ b/src/amd/vulkan/radv_cmd_buffer.h @@ -652,8 +652,6 @@ radv_emit_shader_pointer(const struct radv_device *device, struct radeon_cmdbuf bool radv_cmd_buffer_uses_mec(struct radv_cmd_buffer *cmd_buffer); -enum amd_ip_type radv_queue_family_to_ring(const struct radv_physical_device *dev, enum radv_queue_family f); - void radv_cmd_buffer_reset_rendering(struct radv_cmd_buffer *cmd_buffer); bool radv_cmd_buffer_upload_alloc_aligned(struct radv_cmd_buffer *cmd_buffer, unsigned size, unsigned alignment, diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c index e405f64fd63..eb195368706 100644 --- a/src/amd/vulkan/radv_queue.c +++ b/src/amd/vulkan/radv_queue.c @@ -2526,3 +2526,22 @@ radv_queue_ring(const struct radv_queue *queue) const struct radv_physical_device *pdev = radv_device_physical(device); return radv_queue_family_to_ring(pdev, queue->state.qf); } + +enum amd_ip_type +radv_queue_family_to_ring(const struct radv_physical_device *pdev, enum radv_queue_family f) +{ + switch (f) { + case RADV_QUEUE_GENERAL: + return AMD_IP_GFX; + case RADV_QUEUE_COMPUTE: + return AMD_IP_COMPUTE; + case RADV_QUEUE_TRANSFER: + return AMD_IP_SDMA; + case RADV_QUEUE_VIDEO_DEC: + return pdev->vid_decode_ip; + case RADV_QUEUE_VIDEO_ENC: + return AMD_IP_VCN_ENC; + default: + unreachable("Unknown queue family"); + } +} diff --git a/src/amd/vulkan/radv_queue.h b/src/amd/vulkan/radv_queue.h index f77d228254b..29a9ceb5900 100644 --- a/src/amd/vulkan/radv_queue.h +++ b/src/amd/vulkan/radv_queue.h @@ -32,6 +32,7 @@ #include "radv_radeon_winsys.h" +struct radv_physical_device; struct radv_device; struct radv_queue_ring_info { @@ -130,4 +131,6 @@ bool radv_queue_internal_submit(struct radv_queue *queue, struct radeon_cmdbuf * enum amd_ip_type radv_queue_ring(const struct radv_queue *queue); +enum amd_ip_type radv_queue_family_to_ring(const struct radv_physical_device *dev, enum radv_queue_family f); + #endif /* RADV_QUEUE_H */