ac,radv: use AC_TRACKED_DB_PA_SC_VRS_OVERRIDE_CNTL for PA_SC_VRS_OVERRIDE_CNTL

The enum is meant to be used for both.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40586>
This commit is contained in:
Marek Olšák 2026-03-21 21:03:26 -04:00 committed by Marge Bot
parent 3b4a7f2d1a
commit 9c26b8b924
3 changed files with 7 additions and 5 deletions

View file

@ -986,7 +986,7 @@ ac_set_tracked_regs_to_clear_state(struct ac_tracked_regs *tracked_regs,
tracked_regs->reg_value[AC_TRACKED_CB_DCC_CONTROL] = 0;
tracked_regs->reg_value[AC_TRACKED_CB_COLOR_CONTROL] = 0;
tracked_regs->reg_value[AC_TRACKED_PA_SC_VRS_OVERRIDE_CNTL] = 0;
tracked_regs->reg_value[AC_TRACKED_DB_PA_SC_VRS_OVERRIDE_CNTL] = 0;
/* Set all cleared context registers to saved. */
BITSET_SET_COUNT(tracked_regs->reg_saved_mask, 0, AC_NUM_TRACKED_CONTEXT_REGS);

View file

@ -252,7 +252,9 @@ enum ac_tracked_reg
AC_TRACKED_SPI_SHADER_GS_MESHLET_EXP_ALLOC, /* GFX11+ */
AC_TRACKED_SPI_SHADER_GS_MESHLET_CTRL, /* GFX12+ */
AC_TRACKED_PA_SC_VRS_OVERRIDE_CNTL, /* GFX11+ */
/* This spot is only for new SH and UCONFIG register enums.
* Context register enums should be before AC_NUM_TRACKED_CONTEXT_REGS.
*/
AC_NUM_ALL_TRACKED_REGS,
};

View file

@ -3860,16 +3860,16 @@ gfx103_emit_vrs_state(struct radv_cmd_buffer *cmd_buffer)
radeon_begin(cs);
if (pdev->info.gfx_level >= GFX12) {
gfx12_begin_context_regs();
gfx12_opt_set_context_reg(R_0283D0_PA_SC_VRS_OVERRIDE_CNTL, AC_TRACKED_PA_SC_VRS_OVERRIDE_CNTL,
gfx12_opt_set_context_reg(R_0283D0_PA_SC_VRS_OVERRIDE_CNTL, AC_TRACKED_DB_PA_SC_VRS_OVERRIDE_CNTL,
pa_sc_vrs_override_cntl);
gfx12_end_context_regs();
} else if (pdev->info.has_set_context_pairs_packed) {
gfx11_begin_packed_context_regs();
gfx11_opt_set_context_reg(R_0283D0_PA_SC_VRS_OVERRIDE_CNTL, AC_TRACKED_PA_SC_VRS_OVERRIDE_CNTL,
gfx11_opt_set_context_reg(R_0283D0_PA_SC_VRS_OVERRIDE_CNTL, AC_TRACKED_DB_PA_SC_VRS_OVERRIDE_CNTL,
pa_sc_vrs_override_cntl);
gfx11_end_packed_context_regs();
} else {
radeon_opt_set_context_reg(R_0283D0_PA_SC_VRS_OVERRIDE_CNTL, AC_TRACKED_PA_SC_VRS_OVERRIDE_CNTL,
radeon_opt_set_context_reg(R_0283D0_PA_SC_VRS_OVERRIDE_CNTL, AC_TRACKED_DB_PA_SC_VRS_OVERRIDE_CNTL,
pa_sc_vrs_override_cntl);
}
radeon_end();