diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 392518d044e..a624c2d0228 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -1554,11 +1554,6 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, return AC_QUERY_GPU_INFO_FAIL; } - ac_drm_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE, - sizeof(info->dec_caps), &(info->dec_caps)); - ac_drm_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_ENCODE, - sizeof(info->enc_caps), &(info->enc_caps)); - if (!ac_identify_chip(info, &device_info)) return AC_QUERY_GPU_INFO_UNIMPLEMENTED_HW; @@ -2021,37 +2016,7 @@ void ac_print_gpu_info(FILE *f, const struct radeon_info *info, int fd) if (info->ip[AMD_IP_VCN_JPEG].num_queues) fprintf(f, " jpeg_decode = %u\n", info->ip[AMD_IP_VCN_JPEG].num_instances); - if (info->ip[AMD_IP_VCN_DEC].num_queues || info->ip[AMD_IP_VCN_UNIFIED].num_queues - || info->ip[AMD_IP_VCE].num_queues || info->ip[AMD_IP_UVD].num_queues) { - char max_res_dec[64] = {0}, max_res_enc[64] = {0}; - char codec_str[][8] = { - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2] = "mpeg2", - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4] = "mpeg4", - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1] = "vc1", - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC] = "h264", - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC] = "hevc", - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG] = "jpeg", - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9] = "vp9", - [AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1] = "av1", - }; - fprintf(f, " %-8s %-4s %-16s %-4s %-16s\n", - "codec", "dec", "max_resolution", "enc", "max_resolution"); - for (unsigned i = 0; i < AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_COUNT; i++) { - if (info->dec_caps.codec_info[i].valid) - sprintf(max_res_dec, "%ux%u", info->dec_caps.codec_info[i].max_width, - info->dec_caps.codec_info[i].max_height); - else - sprintf(max_res_dec, "%s", "-"); - if (info->enc_caps.codec_info[i].valid) - sprintf(max_res_enc, "%ux%u", info->enc_caps.codec_info[i].max_width, - info->enc_caps.codec_info[i].max_height); - else - sprintf(max_res_enc, "%s", "-"); - fprintf(f, " %-8s %-4s %-16s %-4s %-16s\n", codec_str[i], - info->dec_caps.codec_info[i].valid ? "*" : "-", max_res_dec, - info->enc_caps.codec_info[i].valid ? "*" : "-", max_res_enc); - } - } + ac_print_video_info(f, info); fprintf(f, "Kernel & winsys capabilities:\n"); fprintf(f, " drm = %i.%i.%i\n", info->drm_major, info->drm_minor, info->drm_patchlevel); diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index b189cfdbc62..1ba565b5a70 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -352,16 +352,6 @@ struct radeon_info { uint32_t vcn_enc_major_version; uint32_t vcn_enc_minor_version; uint32_t vcn_fw_revision; - struct video_caps_info { - struct video_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; - } codec_info[8]; /* the number of available codecs */ - } dec_caps, enc_caps; struct ac_video_caps video_caps; enum vcn_version vcn_ip_version;