From 52663ec80fd8a4fa4fe82ea27188964740d4b319 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 28 Mar 2024 13:42:51 +0100 Subject: [PATCH] radv/winsys: rename gpu_info to pci_ids in the null winsys To avoid a conflict in the next commit. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/winsys/null/radv_null_winsys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/winsys/null/radv_null_winsys.c b/src/amd/vulkan/winsys/null/radv_null_winsys.c index 399ac1731e7..8d4feb01779 100644 --- a/src/amd/vulkan/winsys/null/radv_null_winsys.c +++ b/src/amd/vulkan/winsys/null/radv_null_winsys.c @@ -36,7 +36,7 @@ static const struct { uint32_t pci_id; uint32_t num_render_backends; bool has_dedicated_vram; -} gpu_info[] = { +} pci_ids[] = { /* clang-format off */ [CHIP_TAHITI] = {0x6780, 8, true}, [CHIP_PITCAIRN] = {0x6800, 8, true}, @@ -110,7 +110,7 @@ radv_null_winsys_query_info(struct radeon_winsys *rws, struct radeon_info *info) abort(); } - info->pci_id = gpu_info[info->family].pci_id; + info->pci_id = pci_ids[info->family].pci_id; info->max_se = 4; info->num_se = 4; if (info->gfx_level >= GFX10_3) @@ -144,9 +144,9 @@ radv_null_winsys_query_info(struct radeon_winsys *rws, struct radeon_info *info) : 32 * 1024; info->lds_encode_granularity = info->gfx_level >= GFX7 ? 128 * 4 : 64 * 4; info->lds_alloc_granularity = info->gfx_level >= GFX10_3 ? 256 * 4 : info->lds_encode_granularity; - info->max_render_backends = gpu_info[info->family].num_render_backends; + info->max_render_backends = pci_ids[info->family].num_render_backends; - info->has_dedicated_vram = gpu_info[info->family].has_dedicated_vram; + info->has_dedicated_vram = pci_ids[info->family].has_dedicated_vram; info->has_packed_math_16bit = info->gfx_level >= GFX9; info->has_image_load_dcc_bug = info->family == CHIP_NAVI23 || info->family == CHIP_VANGOGH;