Module: Mesa Branch: staging/23.1 Commit: 4bebab6c552747393db495e1ab60f6859b8ebffb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bebab6c552747393db495e1ab60f6859b8ebffb
Author: Dave Airlie <[email protected]> Date: Wed Jun 21 10:33:32 2023 +1000 radv/video: drop incorrect defines for uapi ones. I missed there's an off by one, and found the kernel defined the correct bits, so just use that. Fixes: 9477f117f4d4 ("radv/video: add initial frameworking.") Reviewed-by: Lynne <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23757> (cherry picked from commit 146adbd2f49c2e25dc10a0cb388c3872c313d710) --- .pick_status.json | 2 +- src/amd/vulkan/radv_private.h | 11 ----------- src/amd/vulkan/radv_video.c | 10 ++++++++-- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c7f12f3050a..919ffe492dd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -94,7 +94,7 @@ "description": "radv/video: drop incorrect defines for uapi ones.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9477f117f4d45445dd8d3ccc2497b5e4dfb48bd6" }, diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index bd4d45bbed7..385ea27fb4a 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -2988,17 +2988,6 @@ struct radv_video_session_params { struct vk_video_session_parameters vk; }; -/* needed for ac_gpu_info codecs */ -#define RADV_VIDEO_FORMAT_UNKNOWN 0 -#define RADV_VIDEO_FORMAT_MPEG12 1 /**< MPEG1, MPEG2 */ -#define RADV_VIDEO_FORMAT_MPEG4 2 /**< DIVX, XVID */ -#define RADV_VIDEO_FORMAT_VC1 3 /**< WMV */ -#define RADV_VIDEO_FORMAT_MPEG4_AVC 4/**< H.264 */ -#define RADV_VIDEO_FORMAT_HEVC 5 /**< H.265 */ -#define RADV_VIDEO_FORMAT_JPEG 6 /**< JPEG */ -#define RADV_VIDEO_FORMAT_VP9 7 /**< VP9 */ -#define RADV_VIDEO_FORMAT_AV1 8 /**< AV1 */ - bool radv_queue_internal_submit(struct radv_queue *queue, struct radeon_cmdbuf *cs); int radv_queue_init(struct radv_device *device, struct radv_queue *queue, int idx, diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c index 9d7018b0230..32d56243297 100644 --- a/src/amd/vulkan/radv_video.c +++ b/src/amd/vulkan/radv_video.c @@ -27,6 +27,10 @@ **************************************************************************/ #include "radv_private.h" +#ifndef _WIN32 +#include "drm-uapi/amdgpu_drm.h" +#endif + #include "vk_video/vulkan_video_codecs_common.h" #include "ac_vcn_dec.h" #include "ac_uvd_dec.h" @@ -305,12 +309,14 @@ radv_GetPhysicalDeviceVideoCapabilitiesKHR(VkPhysicalDevice physicalDevice, struct video_codec_cap *cap = NULL; switch (pVideoProfile->videoCodecOperation) { +#ifndef _WIN32 case VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR: - cap = &pdevice->rad_info.dec_caps.codec_info[RADV_VIDEO_FORMAT_MPEG4_AVC]; + cap = &pdevice->rad_info.dec_caps.codec_info[AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC]; break; case VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR: - cap = &pdevice->rad_info.dec_caps.codec_info[RADV_VIDEO_FORMAT_HEVC]; + cap = &pdevice->rad_info.dec_caps.codec_info[AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC]; break; +#endif default: unreachable("unsupported operation"); }
