From 73017ea86a3bdadd89f03d871cb716351e75d33d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 10 Jun 2026 13:24:38 +0200 Subject: [PATCH] ac/video: drop an useless drm_minor check The required DRM version is 3.54. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/common/ac_video.c | 98 +++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/src/amd/common/ac_video.c b/src/amd/common/ac_video.c index 8d82e506a7e..131729393f9 100644 --- a/src/amd/common/ac_video.c +++ b/src/amd/common/ac_video.c @@ -644,59 +644,57 @@ ac_fill_video_info(struct radeon_info *info, struct ac_drm_device *dev) vpe_caps(info); } - if (info->drm_minor >= 41) { - struct amdgpu_codec_cap { - uint32_t valid; - uint32_t max_width; - uint32_t max_height; - uint32_t max_pixels_per_frame; - uint32_t max_level; - uint32_t pad; - } dec_cap[8], enc_cap[8]; + struct amdgpu_codec_cap { + uint32_t valid; + uint32_t max_width; + uint32_t max_height; + uint32_t max_pixels_per_frame; + uint32_t max_level; + uint32_t pad; + } dec_cap[8], enc_cap[8]; - int ret = ac_drm_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE, sizeof(dec_cap), dec_cap); - ret |= ac_drm_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_ENCODE, sizeof(enc_cap), enc_cap); + int ret = ac_drm_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE, sizeof(dec_cap), dec_cap); + ret |= ac_drm_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_ENCODE, sizeof(enc_cap), enc_cap); - if (ret != 0) - return; + if (ret != 0) + return; - for (uint32_t i = 0; i < ARRAY_SIZE(dec_cap); i++) { - enum ac_video_codec codec = AC_VIDEO_CODEC_MAX; - switch (i) { - case 0: - codec = AC_VIDEO_CODEC_MPEG2; - break; - case 2: - codec = AC_VIDEO_CODEC_VC1; - break; - case 3: - codec = AC_VIDEO_CODEC_AVC; - break; - case 4: - codec = AC_VIDEO_CODEC_HEVC; - break; - case 5: - codec = AC_VIDEO_CODEC_MJPEG; - break; - case 6: - codec = AC_VIDEO_CODEC_VP9; - break; - case 7: - codec = AC_VIDEO_CODEC_AV1; - break; - } - if (codec < AC_VIDEO_CODEC_DEC_MAX) { - info->video_caps.dec[codec].supported &= dec_cap[i].valid; - info->video_caps.dec[codec].max_width = dec_cap[i].max_width; - info->video_caps.dec[codec].max_height = dec_cap[i].max_height; - info->video_caps.dec[codec].max_level = dec_cap[i].max_level; - } - if (codec < AC_VIDEO_CODEC_ENC_MAX) { - info->video_caps.enc[codec].supported &= enc_cap[i].valid; - info->video_caps.enc[codec].max_width = enc_cap[i].max_width; - info->video_caps.enc[codec].max_height = enc_cap[i].max_height; - info->video_caps.enc[codec].max_level = enc_cap[i].max_level; - } + for (uint32_t i = 0; i < ARRAY_SIZE(dec_cap); i++) { + enum ac_video_codec codec = AC_VIDEO_CODEC_MAX; + switch (i) { + case 0: + codec = AC_VIDEO_CODEC_MPEG2; + break; + case 2: + codec = AC_VIDEO_CODEC_VC1; + break; + case 3: + codec = AC_VIDEO_CODEC_AVC; + break; + case 4: + codec = AC_VIDEO_CODEC_HEVC; + break; + case 5: + codec = AC_VIDEO_CODEC_MJPEG; + break; + case 6: + codec = AC_VIDEO_CODEC_VP9; + break; + case 7: + codec = AC_VIDEO_CODEC_AV1; + break; + } + if (codec < AC_VIDEO_CODEC_DEC_MAX) { + info->video_caps.dec[codec].supported &= dec_cap[i].valid; + info->video_caps.dec[codec].max_width = dec_cap[i].max_width; + info->video_caps.dec[codec].max_height = dec_cap[i].max_height; + info->video_caps.dec[codec].max_level = dec_cap[i].max_level; + } + if (codec < AC_VIDEO_CODEC_ENC_MAX) { + info->video_caps.enc[codec].supported &= enc_cap[i].valid; + info->video_caps.enc[codec].max_width = enc_cap[i].max_width; + info->video_caps.enc[codec].max_height = enc_cap[i].max_height; + info->video_caps.enc[codec].max_level = enc_cap[i].max_level; } } }