amd/common: Add gfx940 codec query support

Add support for GFX940 VCN query

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22158>
This commit is contained in:
Sonny Jiang 2023-02-02 15:17:37 -05:00 committed by Marge Bot
parent b4efb1ef35
commit 5639b23644

View file

@ -934,7 +934,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info)
/* unified ring */
info->has_video_hw.vcn_decode
= info->family >= CHIP_GFX1100
= (info->family >= CHIP_GFX1100 || info->family == CHIP_GFX940)
? info->ip[AMD_IP_VCN_UNIFIED].num_queues != 0
: info->ip[AMD_IP_VCN_DEC].num_queues != 0;
info->has_userptr = true;
@ -1572,7 +1572,8 @@ void ac_print_gpu_info(struct radeon_info *info, FILE *f)
[AMD_IP_VCE] = "VCE",
[AMD_IP_UVD_ENC] = "UVD_ENC",
[AMD_IP_VCN_DEC] = "VCN_DEC",
[AMD_IP_VCN_ENC] = info->family >= CHIP_GFX1100 ? "VCN" : "VCN_ENC",
[AMD_IP_VCN_ENC] = (info->family >= CHIP_GFX1100 ||
info->family == CHIP_GFX940) ? "VCN" : "VCN_ENC",
[AMD_IP_VCN_JPEG] = "VCN_JPG",
};
@ -1663,7 +1664,7 @@ void ac_print_gpu_info(struct radeon_info *info, FILE *f)
fprintf(f, "Multimedia info:\n");
fprintf(f, " vce_encode = %u\n", info->ip[AMD_IP_VCE].num_queues);
if (info->family >= CHIP_GFX1100)
if (info->family >= CHIP_GFX1100 || info->family == CHIP_GFX940)
fprintf(f, " vcn_unified = %u\n", info->has_video_hw.vcn_decode);
else {
fprintf(f, " vcn_decode = %u\n", info->has_video_hw.vcn_decode);