From 5a39e1e6451735f244679c83288c306699625de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 20 Nov 2025 10:40:20 +0100 Subject: [PATCH] amd: remove radeon_info::is_pro_graphics Part-of: --- src/amd/common/ac_gpu_info.c | 4 ---- src/amd/common/ac_gpu_info.h | 1 - src/gallium/drivers/radeonsi/si_pipe.c | 10 +++++++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 663508c4d09..f7362bce812 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -587,9 +587,6 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, info->chip_external_rev = device_info.external_rev; info->chip_rev = device_info.chip_rev; info->marketing_name = ac_drm_get_marketing_name(dev); - info->is_pro_graphics = info->marketing_name && (strstr(info->marketing_name, "Pro") || - strstr(info->marketing_name, "PRO") || - strstr(info->marketing_name, "Frontier")); } #define VCN_IP_VERSION(mj, mn, rv) (((mj) << 16) | ((mn) << 8) | (rv)) @@ -1713,7 +1710,6 @@ void ac_print_gpu_info(FILE *f, const struct radeon_info *info, int fd) fprintf(f, "Flags:\n"); fprintf(f, " family_overridden = %u\n", info->family_overridden); - fprintf(f, " is_pro_graphics = %u\n", info->is_pro_graphics); fprintf(f, " has_graphics = %i\n", info->has_graphics); fprintf(f, " has_clear_state = %u\n", info->has_clear_state); fprintf(f, " has_distributed_tess = %u\n", info->has_distributed_tess); diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 4097398fbbb..db6e8efa7c6 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -77,7 +77,6 @@ struct radeon_info { /* Flags. */ bool family_overridden; /* AMD_FORCE_FAMILY was used, skip command submission */ - bool is_pro_graphics; bool has_graphics; /* false if the chip is compute-only */ bool has_clear_state; bool has_distributed_tess; diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index be7b1c012d9..b8050612dc5 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -1287,6 +1287,14 @@ static void si_setup_force_shader_use_aco(struct si_screen *sscreen, bool suppor fclose(f); } +static bool +is_pro_graphics(struct si_screen *sscreen) +{ + return strstr(sscreen->info.marketing_name, "Pro") || + strstr(sscreen->info.marketing_name, "PRO") || + strstr(sscreen->info.marketing_name, "Frontier"); +} + static struct pipe_screen *radeonsi_screen_create_impl(struct radeon_winsys *ws, const struct pipe_screen_config *config) { @@ -1395,7 +1403,7 @@ static struct pipe_screen *radeonsi_screen_create_impl(struct radeon_winsys *ws, sscreen->use_ngg = !(sscreen->debug_flags & DBG(NO_NGG)) && sscreen->info.gfx_level >= GFX10 && (sscreen->info.family != CHIP_NAVI14 || - sscreen->info.is_pro_graphics); + is_pro_graphics(sscreen)); sscreen->use_ngg_culling = sscreen->use_ngg && sscreen->info.max_render_backends >= 2 && !(sscreen->debug_flags & DBG(NO_NGG_CULLING));