Module: Mesa Branch: main Commit: 85eead4198dfe2e8209dccd44b6ec5a6d8839e60 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85eead4198dfe2e8209dccd44b6ec5a6d8839e60
Author: Dave Airlie <[email protected]> Date: Mon Mar 14 10:46:42 2022 +1000 radv: adding video decode queue support This adds the video queue interactions to radv and builds on the winsys code previously added. Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20388> --- src/amd/vulkan/radv_cmd_buffer.c | 10 ++++++++-- src/amd/vulkan/radv_device.c | 3 ++- src/amd/vulkan/radv_private.h | 12 ++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 90719943990..4ecebb241e4 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -264,6 +264,10 @@ radv_queue_family_to_ring(struct radv_physical_device *physical_device, return AMD_IP_COMPUTE; case RADV_QUEUE_TRANSFER: return AMD_IP_SDMA; + case RADV_QUEUE_VIDEO_DEC: + return radv_has_uvd(physical_device) ? AMD_IP_UVD : AMD_IP_VCN_DEC; + case RADV_QUEUE_VIDEO_ENC: + return AMD_IP_VCN_ENC; default: unreachable("Unknown queue family"); } @@ -6039,7 +6043,8 @@ radv_EndCommandBuffer(VkCommandBuffer commandBuffer) radv_emit_mip_change_flush_default(cmd_buffer); - if (cmd_buffer->qf != RADV_QUEUE_TRANSFER) { + if (cmd_buffer->qf == RADV_QUEUE_GENERAL || + cmd_buffer->qf == RADV_QUEUE_COMPUTE) { if (cmd_buffer->device->physical_device->rad_info.gfx_level == GFX6) cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_PS_PARTIAL_FLUSH | RADV_CMD_FLAG_WB_L2; @@ -6079,7 +6084,8 @@ radv_EndCommandBuffer(VkCommandBuffer commandBuffer) /* Make sure CP DMA is idle at the end of IBs because the kernel * doesn't wait for it. */ - si_cp_dma_wait_for_idle(cmd_buffer); + if (cmd_buffer->qf != RADV_QUEUE_VIDEO_DEC) + si_cp_dma_wait_for_idle(cmd_buffer); radv_describe_end_cmd_buffer(cmd_buffer); diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 23b1e296407..546e8195a2d 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -5502,7 +5502,8 @@ radv_update_preambles(struct radv_queue_state *queue, struct radv_device *device struct vk_command_buffer *const *cmd_buffers, uint32_t cmd_buffer_count, bool *use_perf_counters, bool *use_ace) { - if (queue->qf == RADV_QUEUE_TRANSFER) + if (queue->qf != RADV_QUEUE_GENERAL && + queue->qf != RADV_QUEUE_COMPUTE) return VK_SUCCESS; /* Figure out the needs of the current submission. diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index f8ccf68c61a..f94ab4022f3 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -250,6 +250,8 @@ enum radv_queue_family { RADV_QUEUE_GENERAL, RADV_QUEUE_COMPUTE, RADV_QUEUE_TRANSFER, + RADV_QUEUE_VIDEO_DEC, + RADV_QUEUE_VIDEO_ENC, RADV_MAX_QUEUE_FAMILIES, RADV_QUEUE_FOREIGN = RADV_MAX_QUEUE_FAMILIES, RADV_QUEUE_IGNORED, @@ -736,6 +738,16 @@ vk_queue_to_radv(const struct radv_physical_device *phys_dev, int queue_family_i enum amd_ip_type radv_queue_family_to_ring(struct radv_physical_device *physical_device, enum radv_queue_family f); +static inline bool +radv_has_uvd(struct radv_physical_device *phys_dev) +{ + enum radeon_family family = phys_dev->rad_info.family; + /* Only support UVD on TONGA+ */ + if (family < CHIP_TONGA) + return false; + return phys_dev->rad_info.ip[AMD_IP_UVD].num_queues > 0; +} + struct radv_queue_ring_info { uint32_t scratch_size_per_wave; uint32_t scratch_waves;
