From d830d213b6b54b49f95746035d417a61e8275eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 1 Nov 2021 10:50:04 -0400 Subject: [PATCH] ac/gpu_info: don't fail on amdgpu_query_video_caps_info failures When VCN is unsupported, we don't want to break GL or Vulkan. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_gpu_info.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 0d4f349bd0b..e5b8f642f13 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -535,19 +535,10 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, info->vram_size_kb = DIV_ROUND_UP(info->vram_size, 1024); if (info->drm_minor >= 41) { - r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE, - sizeof(info->dec_caps), &(info->dec_caps)); - if (r) { - fprintf(stderr, "amdgpu: amdgpu_query_video_caps_info for decode failed.\n"); - return r; - } - - r = amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_ENCODE, - sizeof(info->enc_caps), &(info->enc_caps)); - if (r) { - fprintf(stderr, "amdgpu: amdgpu_query_video_caps_info for encode failed.\n"); - return r; - } + amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_DECODE, + sizeof(info->dec_caps), &(info->dec_caps)); + amdgpu_query_video_caps_info(dev, AMDGPU_INFO_VIDEO_CAPS_ENCODE, + sizeof(info->enc_caps), &(info->enc_caps)); } /* Add some margin of error, though this shouldn't be needed in theory. */