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

radv: remove radeon_winsys::get_chip_name() and use info->marketing_name directly

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37525>
This commit is contained in:
Daniel Schürmann 2025-09-22 15:40:47 +02:00 • committed by Marge Bot
parent 797ddfe4d2
commit 04ebbc3c41
4 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2360,10 +2360,9 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
#endif
snprintf(pdev->name, sizeof(pdev->name), "AMD RADV %s%s", pdev->info.name, radv_get_compiler_string(pdev));
const char *marketing_name = pdev->ws->get_chip_name(pdev->ws);
snprintf(pdev->marketing_name, sizeof(pdev->name), "%s (RADV %s%s)", marketing_name ? marketing_name : "AMD Unknown",
pdev->info.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,
radv_get_compiler_string(pdev));
if (pdev->info.gfx_level >= GFX12)
vk_warn_non_conformant_implementation("radv");

2
src/amd/vulkan/radv_radeon_winsys.h
View file

@ -230,8 +230,6 @@ struct radeon_winsys {
bool (*read_registers)(struct radeon_winsys *ws, unsigned reg_offset, unsigned num_registers, uint32_t *out);
const char *(*get_chip_name)(struct radeon_winsys *ws);
bool (*query_gpuvm_fault)(struct radeon_winsys *ws, struct radv_winsys_gpuvm_fault_info *fault_info);
VkResult (*buffer_create)(struct radeon_winsys *ws, uint64_t size, unsigned alignment, enum radeon_bo_domain domain,

9
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
View file

@ -87,14 +87,6 @@ radv_amdgpu_winsys_read_registers(struct radeon_winsys *rws, unsigned reg_offset
return ac_drm_read_mm_registers(ws->dev, reg_offset / 4, num_registers, 0xffffffff, 0, out) == 0;
}
static const char *
radv_amdgpu_winsys_get_chip_name(struct radeon_winsys *rws)
{
ac_drm_device *dev = ((struct radv_amdgpu_winsys *)rws)->dev;
return ac_drm_get_marketing_name(dev);
}
static bool
radv_amdgpu_winsys_query_gpuvm_fault(struct radeon_winsys *rws, struct radv_winsys_gpuvm_fault_info *fault_info)
{
@ -339,7 +331,6 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags,
ws->base.query_info = radv_amdgpu_winsys_query_info;
ws->base.query_value = radv_amdgpu_winsys_query_value;
ws->base.read_registers = radv_amdgpu_winsys_read_registers;
ws->base.get_chip_name = radv_amdgpu_winsys_get_chip_name;
ws->base.query_gpuvm_fault = radv_amdgpu_winsys_query_gpuvm_fault;
ws->base.destroy = radv_amdgpu_winsys_destroy;
ws->base.get_fd = radv_amdgpu_winsys_get_fd;

7
src/amd/vulkan/winsys/null/radv_null_winsys.c
View file

@ -167,12 +167,6 @@ radv_null_winsys_query_info(struct radeon_winsys *rws, struct radeon_info *gpu_i
gpu_info->gart_page_size = 4096;
}
static const char *
radv_null_winsys_get_chip_name(struct radeon_winsys *rws)
{
return "Null hardware";
}
static void
radv_null_winsys_destroy(struct radeon_winsys *rws)
{
@ -211,7 +205,6 @@ radv_null_winsys_create()
ws->base.get_fd = radv_null_winsys_get_fd;
ws->base.get_sync_types = radv_null_winsys_get_sync_types;
ws->base.get_sync_provider = radv_null_winsys_get_sync_provider;
ws->base.get_chip_name = radv_null_winsys_get_chip_name;
radv_null_bo_init_functions(ws);
radv_null_cs_init_functions(ws);