From f3f00f77adda87c33138d5e40ca594dd19bb4808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 11 Jul 2022 00:27:59 -0400 Subject: [PATCH] ac/gpu_info: remove amdgpu_gpu_info parameter from ac_query_gpu_info Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_gpu_info.c | 20 +++++++++---------- src/amd/common/ac_gpu_info.h | 3 +-- .../vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 2 +- .../vulkan/winsys/amdgpu/radv_amdgpu_winsys.h | 1 - src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 2 +- src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 1 - 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 147948fd0ef..63e0cd084be 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -579,9 +579,9 @@ static void set_custom_cu_en_mask(struct radeon_info *info) } } -bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, - struct amdgpu_gpu_info *amdinfo) +bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info) { + struct amdgpu_gpu_info amdinfo; struct drm_amdgpu_info_device device_info = {0}; struct amdgpu_buffer_size_alignments alignment_info = {0}; uint32_t vce_version = 0, vce_feature = 0, uvd_version = 0, uvd_feature = 0; @@ -622,7 +622,7 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, } /* Query hardware and driver information. */ - r = amdgpu_query_gpu_info(dev, amdinfo); + r = amdgpu_query_gpu_info(dev, &amdinfo); if (r) { fprintf(stderr, "amdgpu: amdgpu_query_gpu_info failed.\n"); return false; @@ -1044,13 +1044,13 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, info->l1_cache_size = 16384; - info->mc_arb_ramcfg = amdinfo->mc_arb_ramcfg; - info->gb_addr_config = amdinfo->gb_addr_cfg; + info->mc_arb_ramcfg = amdinfo.mc_arb_ramcfg; + info->gb_addr_config = amdinfo.gb_addr_cfg; if (info->gfx_level >= GFX9) { info->num_tile_pipes = 1 << G_0098F8_NUM_PIPES(info->gb_addr_config); info->pipe_interleave_bytes = 256 << G_0098F8_PIPE_INTERLEAVE_SIZE_GFX9(info->gb_addr_config); } else { - info->num_tile_pipes = cik_get_num_tile_pipes(amdinfo); + info->num_tile_pipes = cik_get_num_tile_pipes(&amdinfo); info->pipe_interleave_bytes = 256 << G_0098F8_PIPE_INTERLEAVE_SIZE_GFX6(info->gb_addr_config); } info->r600_has_virtual_memory = true; @@ -1223,11 +1223,11 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, info->min_good_cu_per_sa = (info->num_cu / (info->num_se * info->max_sa_per_se * cu_group)) * cu_group; - memcpy(info->si_tile_mode_array, amdinfo->gb_tile_mode, sizeof(amdinfo->gb_tile_mode)); - info->enabled_rb_mask = amdinfo->enabled_rb_pipes_mask; + memcpy(info->si_tile_mode_array, amdinfo.gb_tile_mode, sizeof(amdinfo.gb_tile_mode)); + info->enabled_rb_mask = amdinfo.enabled_rb_pipes_mask; - memcpy(info->cik_macrotile_mode_array, amdinfo->gb_macro_tile_mode, - sizeof(amdinfo->gb_macro_tile_mode)); + memcpy(info->cik_macrotile_mode_array, amdinfo.gb_macro_tile_mode, + sizeof(amdinfo.gb_macro_tile_mode)); info->pte_fragment_size = alignment_info.size_local; info->gart_page_size = alignment_info.size_remote; diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 701123c68b9..cbbf186a11a 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -239,8 +239,7 @@ struct radeon_info { uint32_t spi_cu_en; }; -bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, - struct amdgpu_gpu_info *amdinfo); +bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info); void ac_compute_driver_uuid(char *uuid, size_t size); diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c index 409f77aada1..54d9cab33b5 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c @@ -42,7 +42,7 @@ static bool do_winsys_init(struct radv_amdgpu_winsys *ws, int fd) { - if (!ac_query_gpu_info(fd, ws->dev, &ws->info, &ws->amdinfo)) + if (!ac_query_gpu_info(fd, ws->dev, &ws->info)) return false; if (ws->info.drm_minor < 23) { diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h index 18b3761679f..657b055ffaa 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -43,7 +43,6 @@ struct radv_amdgpu_winsys { amdgpu_device_handle dev; struct radeon_info info; - struct amdgpu_gpu_info amdinfo; struct ac_addrlib *addrlib; bool debug_all_bos; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 2c878e7f3c2..1aa1985227c 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -95,7 +95,7 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, const struct pipe_screen_config *config, int fd) { - if (!ac_query_gpu_info(fd, ws->dev, &ws->info, &ws->amdinfo)) + if (!ac_query_gpu_info(fd, ws->dev, &ws->info)) goto fail; /* TODO: Enable this once the kernel handles it efficiently. */ diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h index 3d6399f843f..1bff953a13a 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h @@ -92,7 +92,6 @@ struct amdgpu_winsys { /* multithreaded IB submission */ struct util_queue cs_queue; - struct amdgpu_gpu_info amdinfo; struct ac_addrlib *addrlib; bool check_vm;