From 68cd36d9b46c0d2f568a0df007e0ad40dcf6cda1 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 26 Aug 2024 10:46:49 +1000 Subject: [PATCH] radv/video: fix reporting video format props for encode. When encode isn't enabled, refuse the image usage, also use the correct error on the decode check. Fixes: 05cd42417ffa ("radv/video: enable video encoding behind perftest flag") Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_video.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index cf49cbb4d85..f8bb0204fa5 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -763,11 +763,18 @@ radv_GetPhysicalDeviceVideoFormatPropertiesKHR(VkPhysicalDevice physicalDevice, uint32_t *pVideoFormatPropertyCount, VkVideoFormatPropertiesKHR *pVideoFormatProperties) { + VK_FROM_HANDLE(radv_physical_device, pdev, physicalDevice); + + if ((pVideoFormatInfo->imageUsage & (VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR | + VK_IMAGE_USAGE_VIDEO_ENCODE_DPB_BIT_KHR)) && + !pdev->video_encode_enabled) + return VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR; + /* radv requires separate allocates for DPB and decode video. */ if ((pVideoFormatInfo->imageUsage & (VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR)) == (VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR | VK_IMAGE_USAGE_VIDEO_DECODE_DST_BIT_KHR)) - return VK_ERROR_FORMAT_NOT_SUPPORTED; + return VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR; VK_OUTARRAY_MAKE_TYPED(VkVideoFormatPropertiesKHR, out, pVideoFormatProperties, pVideoFormatPropertyCount);