From d9d3f6703cc5cfcc995578c706fe91123c1b3611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 21 Nov 2025 12:34:13 -0500 Subject: [PATCH] ac,winsys/amdgpu: report why ac_query_gpu_info failed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit only these case were not reporting anything Reviewed-by: Timur Kristóf Reviewed-by: Samuel Pitoiset Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_gpu_info.c | 8 ++++++-- src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 9c5b8c865ce..e502fcbb07a 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -254,12 +254,16 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, STATIC_ASSERT(AMDGPU_HW_IP_VCN_JPEG == AMD_IP_VCN_JPEG); STATIC_ASSERT(AMDGPU_HW_IP_VPE == AMD_IP_VPE); - if (!handle_env_var_force_family(info)) + if (!handle_env_var_force_family(info)) { + fprintf(stderr, "amdgpu: handle_env_var_force_family failed.\n"); return AC_QUERY_GPU_INFO_UNIMPLEMENTED_HW; + } info->pci.valid = ac_drm_query_pci_bus_info(dev, info) == 0; - if (require_pci_bus_info && !info->pci.valid) + if (require_pci_bus_info && !info->pci.valid) { + fprintf(stderr, "amdgpu: ac_drm_query_pci_bus_info failed.\n"); return AC_QUERY_GPU_INFO_FAIL; + } assert(info->drm_major == 3); info->is_amdgpu = true; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 5a77abd090b..4e3a131b029 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -36,8 +36,10 @@ static bool do_winsys_init(struct amdgpu_winsys *aws, const struct pipe_screen_config *config, int fd) { - if (ac_query_gpu_info(fd, aws->dev, &aws->info, false) != AC_QUERY_GPU_INFO_SUCCESS) + if (ac_query_gpu_info(fd, aws->dev, &aws->info, false) != AC_QUERY_GPU_INFO_SUCCESS) { + fprintf(stderr, "amdgpu: ac_query_gpu_info failed.\n"); goto fail; + } aws->addrlib = ac_addrlib_create(&aws->info, &aws->info.max_alignment); if (!aws->addrlib) {