From 0cb42c57c569443b0af8296dfff4da1e6ab241ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 26 Apr 2022 22:29:31 -0400 Subject: [PATCH] radeonsi: always print the lower-case GPU name for radeonsi-run-tests.py This fixes the GPU name detection in radeonsi-run-tests.py when the marketing name is unknown. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_get.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index f83611ce6ca..99f67128db8 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -978,12 +978,9 @@ static void si_init_renderer_string(struct si_screen *sscreen) char first_name[256], second_name[32] = {}, kernel_version[128] = {}; struct utsname uname_data; - if (sscreen->info.marketing_name) { - snprintf(first_name, sizeof(first_name), "%s", sscreen->info.marketing_name); - snprintf(second_name, sizeof(second_name), "%s, ", sscreen->info.lowercase_name); - } else { - snprintf(first_name, sizeof(first_name), "AMD %s", sscreen->info.name); - } + 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); if (uname(&uname_data) == 0) snprintf(kernel_version, sizeof(kernel_version), ", %s", uname_data.release);