From a54c8cdaf211b40fcc18d11de037b18d79ef6ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 21 Oct 2022 15:08:15 -0400 Subject: [PATCH] ac/gpu_info: simplify how has_accelerated_dot_product is set Reviewed-by: Mihai Preda Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_gpu_info.c | 4 ++-- src/amd/vulkan/winsys/null/radv_null_winsys.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 2745a2c48bf..aad1ded07bc 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -1063,8 +1063,8 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info) * instruction encoding which accumulates with the destination. */ info->has_accelerated_dot_product = - info->family == CHIP_ARCTURUS || info->family == CHIP_ALDEBARAN || - info->family == CHIP_VEGA20 || info->family >= CHIP_NAVI12; + info->family == CHIP_VEGA20 || + (info->family >= CHIP_ARCTURUS && info->family != CHIP_NAVI10); /* TODO: Figure out how to use LOAD_CONTEXT_REG on GFX6-GFX7. */ info->has_load_ctx_reg_pkt = diff --git a/src/amd/vulkan/winsys/null/radv_null_winsys.c b/src/amd/vulkan/winsys/null/radv_null_winsys.c index 0a3f7e2ea29..cedf5be3f3f 100644 --- a/src/amd/vulkan/winsys/null/radv_null_winsys.c +++ b/src/amd/vulkan/winsys/null/radv_null_winsys.c @@ -147,8 +147,8 @@ radv_null_winsys_query_info(struct radeon_winsys *rws, struct radeon_info *info) info->family == CHIP_NAVI23 || info->family == CHIP_VANGOGH; info->has_accelerated_dot_product = - info->family == CHIP_ARCTURUS || info->family == CHIP_ALDEBARAN || - info->family == CHIP_VEGA20 || info->family >= CHIP_NAVI12; + info->family == CHIP_VEGA20 || + (info->family >= CHIP_ARCTURUS && info->family != CHIP_NAVI10); info->address32_hi = info->gfx_level >= GFX9 ? 0xffff8000u : 0x0;