From 82aca689c10fd5acaf3d0c688ee02d6f1b63e153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 29 Feb 2024 15:03:58 -0500 Subject: [PATCH] ac: use the gfx11 shadowed register tables for gfx11.5 Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_shadowed_regs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/common/ac_shadowed_regs.c b/src/amd/common/ac_shadowed_regs.c index 46f12842df1..cacc46a4ca2 100644 --- a/src/amd/common/ac_shadowed_regs.c +++ b/src/amd/common/ac_shadowed_regs.c @@ -732,7 +732,7 @@ void ac_get_reg_ranges(enum amd_gfx_level gfx_level, enum radeon_family family, switch (type) { case SI_REG_RANGE_UCONFIG: - if (gfx_level == GFX11) + if (gfx_level == GFX11 || gfx_level == GFX11_5) RETURN(Gfx11UserConfigShadowRange); else if (gfx_level == GFX10_3) RETURN(Gfx103UserConfigShadowRange); @@ -742,7 +742,7 @@ void ac_get_reg_ranges(enum amd_gfx_level gfx_level, enum radeon_family family, RETURN(Gfx9UserConfigShadowRange); break; case SI_REG_RANGE_CONTEXT: - if (gfx_level == GFX11) + if (gfx_level == GFX11 || gfx_level == GFX11_5) RETURN(Gfx11ContextShadowRange); else if (gfx_level == GFX10_3) RETURN(Gfx103ContextShadowRange); @@ -752,7 +752,7 @@ void ac_get_reg_ranges(enum amd_gfx_level gfx_level, enum radeon_family family, RETURN(Gfx9ContextShadowRange); break; case SI_REG_RANGE_SH: - if (gfx_level == GFX11) + if (gfx_level == GFX11 || gfx_level == GFX11_5) RETURN(Gfx11ShShadowRange); else if (gfx_level == GFX10_3 || gfx_level == GFX10) RETURN(Gfx10ShShadowRange); @@ -762,7 +762,7 @@ void ac_get_reg_ranges(enum amd_gfx_level gfx_level, enum radeon_family family, RETURN(Gfx9ShShadowRange); break; case SI_REG_RANGE_CS_SH: - if (gfx_level == GFX11) + if (gfx_level == GFX11 || gfx_level == GFX11_5) RETURN(Gfx11CsShShadowRange); else if (gfx_level == GFX10_3 || gfx_level == GFX10) RETURN(Gfx10CsShShadowRange); @@ -3498,7 +3498,7 @@ void ac_emulate_clear_state(const struct radeon_info *info, struct radeon_cmdbuf unsigned reg_offset = R_02835C_PA_SC_TILE_STEERING_OVERRIDE; uint32_t reg_value = info->pa_sc_tile_steering_override; - if (info->gfx_level >= GFX11) { + if (info->gfx_level == GFX11 || info->gfx_level == GFX11_5) { gfx11_emulate_clear_state(cs, 1, ®_offset, ®_value, set_context_reg_seq_array); } else if (info->gfx_level == GFX10_3) { gfx103_emulate_clear_state(cs, 1, ®_offset, ®_value, set_context_reg_seq_array);