From 8918a809ced3551f822abb45d751d31b54ad67da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Thu, 15 Jul 2021 11:54:33 +0200 Subject: [PATCH] ac: Remove deprecated use_late_alloc field as nobody uses it anymore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf Reviewed-by: Marek Olšák Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/common/ac_gpu_info.c | 5 ----- src/amd/common/ac_gpu_info.h | 1 - src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 63c2058862b..571995b4372 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -1063,18 +1063,14 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, info->num_physical_sgprs_per_simd = 128 * info->max_wave64_per_simd; info->min_sgpr_alloc = 128; info->sgpr_alloc_granularity = 128; - info->use_late_alloc = info->min_good_cu_per_sa > 2; } else if (info->chip_class >= GFX8) { info->num_physical_sgprs_per_simd = 800; info->min_sgpr_alloc = 16; info->sgpr_alloc_granularity = 16; - info->use_late_alloc = true; } else { info->num_physical_sgprs_per_simd = 512; info->min_sgpr_alloc = 8; info->sgpr_alloc_granularity = 8; - /* Potential hang on Kabini: */ - info->use_late_alloc = info->family != CHIP_KABINI; } info->has_3d_cube_border_color_mipmap = info->has_graphics || info->family == CHIP_ARCTURUS; @@ -1266,7 +1262,6 @@ void ac_print_gpu_info(struct radeon_info *info, FILE *f) fprintf(f, " min_wave64_vgpr_alloc = %i\n", info->min_wave64_vgpr_alloc); fprintf(f, " max_vgpr_alloc = %i\n", info->max_vgpr_alloc); fprintf(f, " wave64_vgpr_alloc_granularity = %i\n", info->wave64_vgpr_alloc_granularity); - fprintf(f, " use_late_alloc = %i\n", info->use_late_alloc); fprintf(f, "Render backend info:\n"); fprintf(f, " pa_sc_tile_steering_override = 0x%x\n", info->pa_sc_tile_steering_override); diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 543051fb8c7..c928677369d 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -207,7 +207,6 @@ struct radeon_info { uint32_t min_wave64_vgpr_alloc; uint32_t max_vgpr_alloc; uint32_t wave64_vgpr_alloc_granularity; - bool use_late_alloc; /* deprecated: remove this after radv switches to ac_compute_late_alloc */ /* Render backends (color + depth blocks). */ uint32_t r300_num_gb_pipes; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index ef9ec590d5d..8aedaa7770c 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -605,8 +605,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) ws->info.max_wave64_per_simd = 10; ws->info.num_physical_sgprs_per_simd = 512; ws->info.num_physical_wave64_vgprs_per_simd = 256; - /* Potential hang on Kabini: */ - ws->info.use_late_alloc = ws->info.family != CHIP_KABINI; ws->info.has_3d_cube_border_color_mipmap = true; ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL ||