From 7b2f88b97c0e828b5d4bf4de7452d1d3d9ec1eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 20 Nov 2025 09:20:01 +0100 Subject: [PATCH] amd: remove radeon_info::lowercase_name It is redundant. Part-of: --- src/amd/common/ac_gpu_info.c | 4 ---- src/amd/common/ac_gpu_info.h | 1 - src/gallium/drivers/radeonsi/si_get.c | 7 +++++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 646f4ef740c..9adc9180122 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -591,10 +591,6 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, return AC_QUERY_GPU_INFO_UNIMPLEMENTED_HW; } - memset(info->lowercase_name, 0, sizeof(info->lowercase_name)); - for (unsigned i = 0; info->name[i] && i < ARRAY_SIZE(info->lowercase_name) - 1; i++) - info->lowercase_name[i] = tolower(info->name[i]); - #define VCN_IP_VERSION(mj, mn, rv) (((mj) << 16) | ((mn) << 8) | (rv)) for (unsigned i = AMD_IP_VCN_DEC; i <= AMD_IP_VCN_JPEG; ++i) { diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 8f07c67579a..0df3bff1054 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -34,7 +34,6 @@ struct amd_ip_info { struct radeon_info { /* Device info. */ const char *name; - char lowercase_name[32]; const char *marketing_name; uint32_t num_se; /* only enabled SEs */ uint32_t num_rb; /* only enabled RBs */ diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index 501c5027ba3..9594eeb9915 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: MIT */ +#include #include "compiler/nir/nir.h" #include "ac_nir.h" #include "ac_shader_util.h" @@ -690,7 +691,9 @@ static void si_init_renderer_string(struct si_screen *sscreen) snprintf(first_name, sizeof(first_name), "%s", sscreen->info.marketing_name ? sscreen->info.marketing_name : sscreen->info.name); - snprintf(second_name, sizeof(second_name), "%s, ", sscreen->info.lowercase_name); + memset(second_name, 0, sizeof(second_name)); + for (unsigned i = 0; sscreen->info.name[i] && i < ARRAY_SIZE(second_name) - 1; i++) + second_name[i] = tolower(sscreen->info.name[i]); if (uname(&uname_data) == 0) snprintf(kernel_version, sizeof(kernel_version), ", %s", uname_data.release); @@ -702,7 +705,7 @@ static void si_init_renderer_string(struct si_screen *sscreen) "ACO"; snprintf(sscreen->renderer_string, sizeof(sscreen->renderer_string), - "%s (radeonsi, %s%s, DRM %i.%i%s)", first_name, second_name, compiler_name, + "%s (radeonsi, %s, %s, DRM %i.%i%s)", first_name, second_name, compiler_name, sscreen->info.drm_major, sscreen->info.drm_minor, kernel_version); }