Module: Mesa Branch: main Commit: 6725edbd2ab31cd1b998892274ab545d6e3aa22f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6725edbd2ab31cd1b998892274ab545d6e3aa22f
Author: Marek Olšák <marek.ol...@amd.com> Date: Tue Oct 24 07:35:29 2023 -0400 radeonsi/gfx11: use PKT3_SET_CONTEXT_REG_PAIRS_PACKED for PM4 states Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26095> --- src/gallium/drivers/radeonsi/si_pm4.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c index 6eb6b777ffc..a53904e4920 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.c +++ b/src/gallium/drivers/radeonsi/si_pm4.c @@ -35,13 +35,13 @@ static unsigned pairs_packed_opcode_to_regular(unsigned opcode) static unsigned regular_opcode_to_pairs(struct si_pm4_state *state, unsigned opcode) { - if (state->screen->info.has_set_sh_pairs_packed) { - switch (opcode) { - case PKT3_SET_CONTEXT_REG: - return PKT3_SET_CONTEXT_REG_PAIRS_PACKED; - case PKT3_SET_SH_REG: - return PKT3_SET_SH_REG_PAIRS_PACKED; - } + const struct radeon_info *info = &state->screen->info; + + switch (opcode) { + case PKT3_SET_CONTEXT_REG: + return info->has_set_context_pairs_packed ? PKT3_SET_CONTEXT_REG_PAIRS_PACKED : opcode; + case PKT3_SET_SH_REG: + return info->has_set_sh_pairs_packed ? PKT3_SET_SH_REG_PAIRS_PACKED : opcode; } return opcode;
