AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac,winsys/amdgpu: report why ac_query_gpu_info failed

Browse Source 
only these case were not reporting anything

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38602>
This commit is contained in:
Marek Olšák
2025-11-21 12:34:13 -05:00
committed by Marge Bot
parent 1c3e7e4ca0
commit d9d3f6703c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/common/ac_gpu_info.c
+6 -2
View File
@@ -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;
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+3 -1
View File
@@ -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) {