fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 11:20:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

amd: replace uses of radeon_info::name with ac_get_family_name()

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38546>
This commit is contained in:
Daniel Schürmann 2025-11-20 09:39:00 +01:00 • committed by Marge Bot
parent 7b2f88b97c
commit 24a43666e3
9 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/amd/common/ac_gpu_info.c
View file

@ -455,10 +455,11 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
info->pci_rev_id = device_info.pci_rev;
info->vce_harvest_config = device_info.vce_harvest_config;
info->family = CHIP_UNKNOWN;
#define identify_chip2(asic, chipname) \
if (ASICREV_IS(device_info.external_rev, asic)) { \
info->family = CHIP_##chipname; \
info->name = #chipname; \
}
#define identify_chip(chipname) identify_chip2(chipname, chipname)
@ -552,6 +553,12 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
break;
}
if (info->family == CHIP_UNKNOWN) {
fprintf(stderr, "amdgpu: unknown (family_id, chip_external_rev): (%u, %u)\n",
device_info.family, device_info.external_rev);
return AC_QUERY_GPU_INFO_UNIMPLEMENTED_HW;
}
if (info->ip[AMD_IP_GFX].ver_major == 12 && info->ip[AMD_IP_GFX].ver_minor == 0)
info->gfx_level = GFX12;
else if (info->ip[AMD_IP_GFX].ver_major == 11 && info->ip[AMD_IP_GFX].ver_minor == 5)
@ -585,12 +592,6 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
strstr(info->marketing_name, "Frontier"));
}
if (!info->name) {
fprintf(stderr, "amdgpu: unknown (family_id, chip_external_rev): (%u, %u)\n",
device_info.family, device_info.external_rev);
return AC_QUERY_GPU_INFO_UNIMPLEMENTED_HW;
}
#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) {
@ -1641,7 +1642,7 @@ void ac_compute_device_uuid(const struct radeon_info *info, char *uuid, size_t s
void ac_print_gpu_info(FILE *f, const struct radeon_info *info, int fd)
{
fprintf(f, "Device info:\n");
fprintf(f, " name = %s\n", info->name);
fprintf(f, " name = %s\n", ac_get_family_name(info->family));
fprintf(f, " marketing_name = %s\n", info->marketing_name);
char proc_fd[32];

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

@ -33,7 +33,6 @@ struct amd_ip_info {
struct radeon_info {
/* Device info. */
const char *name;
const char *marketing_name;
uint32_t num_se; /* only enabled SEs */
uint32_t num_rb; /* only enabled RBs */

1
src/amd/common/ac_null_device.c
View file

@ -19,7 +19,6 @@ ac_null_device_create(struct radeon_info *gpu_info, const char *family)
if (!strcasecmp(family, ac_get_family_name(i))) {
/* Override family and gfx_level. */
gpu_info->family = i;
gpu_info->name = ac_get_family_name(i);
if (gpu_info->family >= CHIP_GFX1200)
gpu_info->gfx_level = GFX12;

2
src/amd/common/ac_rgp.c
View file

@ -463,7 +463,7 @@ static void ac_sqtt_fill_asic_info(const struct radeon_info *rad_info,
chunk->l1_cache_size = rad_info->tcp_cache_size;
chunk->lds_size = rad_info->lds_size_per_workgroup;
strncpy(chunk->gpu_name, rad_info->name, SQTT_GPU_NAME_MAX_SIZE - 1);
strncpy(chunk->gpu_name, ac_get_family_name(rad_info->family), SQTT_GPU_NAME_MAX_SIZE - 1);
chunk->alu_per_clock = 0.0;
chunk->texture_per_clock = 0.0;

8
src/amd/vulkan/radv_physical_device.c
View file

@ -2326,7 +2326,8 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
/* Allow all devices on a virtual winsys, otherwise do a basic support check. */
if (!radv_is_gpu_supported(&pdev->info)) {
if (instance->debug_flags & RADV_DEBUG_STARTUP)
fprintf(stderr, "radv: info: device '%s' is not supported by RADV.\n", pdev->info.name);
fprintf(stderr, "radv: info: device '%s' is not supported by RADV.\n",
ac_get_family_name(pdev->info.family));
result = VK_ERROR_INCOMPATIBLE_DRIVER;
goto fail_wsi;
}
@ -2358,9 +2359,10 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
pdev->emulate_astc = instance->drirc.features.vk_require_astc;
#endif
snprintf(pdev->name, sizeof(pdev->name), "AMD RADV %s%s", pdev->info.name, radv_get_compiler_string(pdev));
const char *name = ac_get_family_name(pdev->info.family);
snprintf(pdev->name, sizeof(pdev->name), "AMD RADV %s%s", name, radv_get_compiler_string(pdev));
snprintf(pdev->marketing_name, sizeof(pdev->name), "%s (RADV %s%s)",
pdev->info.marketing_name ? pdev->info.marketing_name : "AMD Unknown", pdev->info.name,
pdev->info.marketing_name ? pdev->info.marketing_name : "AMD Unknown", name,
radv_get_compiler_string(pdev));
if (pdev->info.gfx_level >= GFX12)

3
src/amd/vulkan/radv_rra.c
View file

@ -177,7 +177,8 @@ rra_dump_asic_info(const struct radeon_info *gpu_info, FILE *output)
.rev_id = gpu_info->pci_rev_id,
};
strncpy(asic_info.device_name, gpu_info->marketing_name ? gpu_info->marketing_name : gpu_info->name,
strncpy(asic_info.device_name,
gpu_info->marketing_name ? gpu_info->marketing_name : ac_get_family_name(gpu_info->family),
RRA_FILE_DEVICE_NAME_MAX_SIZE - 1);
fwrite(&asic_info, sizeof(struct rra_asic_info), 1, output);

7
src/gallium/drivers/radeonsi/si_get.c
View file

@ -688,12 +688,13 @@ static void si_init_renderer_string(struct si_screen *sscreen)
{
char first_name[256], second_name[32] = {}, kernel_version[128] = {};
struct utsname uname_data;
const char *name = ac_get_family_name(sscreen->info.family);
snprintf(first_name, sizeof(first_name), "%s",
sscreen->info.marketing_name ? sscreen->info.marketing_name : sscreen->info.name);
sscreen->info.marketing_name ? sscreen->info.marketing_name : 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]);
for (unsigned i = 0; name[i] && i < ARRAY_SIZE(second_name) - 1; i++)
second_name[i] = tolower(name[i]);
if (uname(&uname_data) == 0)
snprintf(kernel_version, sizeof(kernel_version), ", %s", uname_data.release);

4
src/gallium/drivers/radeonsi/si_pipe.c
View file

@ -1192,8 +1192,8 @@ static void si_disk_cache_create(struct si_screen *sscreen)
_mesa_sha1_final(&ctx, sha1);
mesa_bytes_to_hex(cache_id, sha1, 20);
sscreen->disk_shader_cache = disk_cache_create(sscreen->info.name, cache_id,
sscreen->info.address32_hi);
sscreen->disk_shader_cache = disk_cache_create(ac_get_family_name(sscreen->info.family),
cache_id, sscreen->info.address32_hi);
}
static void si_set_max_shader_compiler_threads(struct pipe_screen *screen, unsigned max_threads)

1
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
View file

@ -244,7 +244,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
#define CHIPSET(pci_id, cfamily) \
case pci_id: \
ws->info.family = CHIP_##cfamily; \
ws->info.name = #cfamily; \
ws->gen = DRV_SI; \
break;
#include "pci_ids/radeonsi_pci_ids.h"