From 3362da2c53d576f74df3a4b84587fc5a197c2b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 31 Aug 2021 05:50:54 -0400 Subject: [PATCH] ac/gpu_info: fix detection of smart access memory chip_class was 0. Move the code after setting chip_class. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5282 Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_gpu_info.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 7bb4fbb08f0..b7d04e8e68b 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -553,10 +553,6 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, info->all_vram_visible = info->vram_size * 0.9 < info->vram_vis_size; util_cpu_detect(); - info->smart_access_memory = info->all_vram_visible && - info->chip_class >= GFX10_3 && - util_get_cpu_caps()->family >= CPU_AMD_ZEN3 && - util_get_cpu_caps()->family < CPU_AMD_LAST; /* Set chip identification. */ info->pci_id = amdinfo->asic_id; /* TODO: is this correct? */ @@ -653,6 +649,11 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, return false; } + info->smart_access_memory = info->all_vram_visible && + info->chip_class >= GFX10_3 && + util_get_cpu_caps()->family >= CPU_AMD_ZEN3 && + util_get_cpu_caps()->family < CPU_AMD_LAST; + info->family_id = amdinfo->family_id; info->chip_external_rev = amdinfo->chip_external_rev; info->marketing_name = amdgpu_get_marketing_name(dev);