fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/gpu_info: print all IP versions reported by the kernel

Browse source 
It's incorrect for GFX. This is what I get on Radeon 6800:

    IP GFX  10.0 	queues:1
    IP COMP 10.0 	queues:4
    IP SDMA  5.2 	queues:2
    IP VCN_DEC  3.0 	queues:1
    IP VCN_ENC  3.0 	queues:1
    IP VCN_JPG  3.0 	queues:1

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16360>
This commit is contained in:
Marek Olšák 2022-05-05 15:14:55 -04:00 • committed by Marge Bot
parent 616e4ca673
commit b261ac1ab5
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -542,6 +542,8 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
if (r || !ip_info.available_rings) if (r || !ip_info.available_rings)
continue; continue;
info->ip[ip_type].ver_major = ip_info.hw_ip_version_major;
info->ip[ip_type].ver_minor = ip_info.hw_ip_version_minor;
info->ip[ip_type].num_queues = util_bitcount(ip_info.available_rings); info->ip[ip_type].num_queues = util_bitcount(ip_info.available_rings);
info->ib_alignment = MAX3(info->ib_alignment, ip_info.ib_start_alignment, info->ib_alignment = MAX3(info->ib_alignment, ip_info.ib_start_alignment,
ip_info.ib_size_alignment); ip_info.ib_size_alignment);
@ -1296,15 +1298,26 @@ void ac_print_gpu_info(struct radeon_info *info, FILE *f)
fprintf(f, " clock_crystal_freq = %i KHz\n", info->clock_crystal_freq); fprintf(f, " clock_crystal_freq = %i KHz\n", info->clock_crystal_freq);
fprintf(f, "Features:\n"); fprintf(f, "Features:\n");
fprintf(f, " ip[AMD_IP_GFX].num_queues = %i\n", info->ip[AMD_IP_GFX].num_queues);
fprintf(f, " ip[AMD_IP_SDMA].num_queues = %i\n", info->ip[AMD_IP_SDMA].num_queues); static const char *ip_string[] = {
fprintf(f, " ip[AMD_IP_COMPUTE].num_queues = %u\n", info->ip[AMD_IP_COMPUTE].num_queues); [AMD_IP_GFX] = "GFX",
fprintf(f, " ip[AMD_IP_UVD].num_queues = %i\n", info->ip[AMD_IP_UVD].num_queues); [AMD_IP_COMPUTE] = "COMP",
fprintf(f, " ip[AMD_IP_VCE].num_queues = %i\n", info->ip[AMD_IP_VCE].num_queues); [AMD_IP_SDMA] = "SDMA",
fprintf(f, " ip[AMD_IP_UVD_ENC].num_queues = %i\n", info->ip[AMD_IP_UVD_ENC].num_queues); [AMD_IP_UVD] = "UVD",
fprintf(f, " ip[AMD_IP_VCN_DEC].num_queues = %i\n", info->ip[AMD_IP_VCN_DEC].num_queues); [AMD_IP_VCE] = "VCE",
fprintf(f, " ip[AMD_IP_VCN_ENC].num_queues = %i\n", info->ip[AMD_IP_VCN_ENC].num_queues); [AMD_IP_UVD_ENC] = "UVD_ENC",
fprintf(f, " ip[AMD_IP_VCN_JPEG].num_queues = %i\n", info->ip[AMD_IP_VCN_JPEG].num_queues); [AMD_IP_VCN_DEC] = "VCN_DEC",
[AMD_IP_VCN_ENC] = "VCN_ENC",
[AMD_IP_VCN_JPEG] = "VCN_JPG",
};
for (unsigned i = 0; i < AMD_NUM_IP_TYPES; i++) {
if (info->ip[i].num_queues) {
fprintf(f, " IP %-4s %2u.%u \tqueues:%u\n", ip_string[i],
info->ip[i].ver_major, info->ip[i].ver_minor, info->ip[i].num_queues);
}
}
fprintf(f, " has_graphics = %i\n", info->has_graphics); fprintf(f, " has_graphics = %i\n", info->has_graphics);
fprintf(f, " has_clear_state = %u\n", info->has_clear_state); fprintf(f, " has_clear_state = %u\n", info->has_clear_state);
fprintf(f, " has_distributed_tess = %u\n", info->has_distributed_tess); fprintf(f, " has_distributed_tess = %u\n", info->has_distributed_tess);

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

@ -43,6 +43,8 @@ extern "C" {
struct amdgpu_gpu_info; struct amdgpu_gpu_info;
struct amd_ip_info { struct amd_ip_info {
uint8_t ver_major;
uint8_t ver_minor;
uint8_t num_queues; uint8_t num_queues;
}; };