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

ac,radeonsi: print a lowercase codename in the renderer string 

to make it stand out less

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13392>
This commit is contained in:
Marek Olšák 2021-10-16 05:46:42 -04:00 committed by Marge Bot
parent cbcdcd42fc
commit f9d7db0262
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/common/ac_gpu_info.c
View File

@ -32,6 +32,7 @@
#include "util/u_math.h"
#include <stdio.h>
#include <ctype.h>
#ifdef _WIN32
#define DRM_CAP_ADDFB2_MODIFIERS 0x10
@ -632,6 +633,10 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
return false;
}
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]);
if (info->family >= CHIP_SIENNA_CICHLID)
info->chip_class = GFX10_3;
else if (info->family >= CHIP_NAVI10)
@ -1133,6 +1138,7 @@ void ac_print_gpu_info(struct radeon_info *info, FILE *f)
info->pci_dev, info->pci_func);
fprintf(f, " name = %s\n", info->name);
fprintf(f, " lowercase_name = %s\n", info->lowercase_name);
fprintf(f, " marketing_name = %s\n", info->marketing_name);
fprintf(f, " is_pro_graphics = %u\n", info->is_pro_graphics);
fprintf(f, " pci_id = 0x%x\n", info->pci_id);

1
src/amd/common/ac_gpu_info.h
View File

@ -48,6 +48,7 @@ struct radeon_info {
/* Device info. */
const char *name;
char lowercase_name[32];
const char *marketing_name;
bool is_pro_graphics;
uint32_t pci_id;

2
src/gallium/drivers/radeonsi/si_get.c
View File

@ -947,7 +947,7 @@ static void si_init_renderer_string(struct si_screen *sscreen)
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.name);
snprintf(second_name, sizeof(second_name), "%s, ", sscreen->info.lowercase_name);
} else {
snprintf(first_name, sizeof(first_name), "AMD %s", sscreen->info.name);
}

3
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
View File

@ -63,7 +63,8 @@ static void handle_env_var_force_family(struct amdgpu_winsys *ws)
if (!strcmp(family, ac_get_llvm_processor_name(i))) {
/* Override family and chip_class. */
ws->info.family = i;
ws->info.name = "GCN-NOOP";
ws->info.name = "NOOP";
strcpy(ws->info.lowercase_name , "noop");
if (i >= CHIP_SIENNA_CICHLID)
ws->info.chip_class = GFX10_3;