Module: Mesa Branch: master Commit: 5a2e65be89d97ed5d7263f0296ea69ae8517187b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a2e65be89d97ed5d7263f0296ea69ae8517187b
Author: Marek Olšák <[email protected]> Date: Tue Aug 6 19:52:24 2019 -0400 radeonsi: don't emit PKT3_CONTEXT_CONTROL on amdgpu Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> --- src/gallium/drivers/radeonsi/si_state.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 19e568259c2..0ae89b821ff 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -5403,10 +5403,13 @@ static void si_init_config(struct si_context *sctx) if (!pm4) return; - si_pm4_cmd_begin(pm4, PKT3_CONTEXT_CONTROL); - si_pm4_cmd_add(pm4, CONTEXT_CONTROL_LOAD_ENABLE(1)); - si_pm4_cmd_add(pm4, CONTEXT_CONTROL_SHADOW_ENABLE(1)); - si_pm4_cmd_end(pm4, false); + /* Since amdgpu version 3.6.0, CONTEXT_CONTROL is emitted by the kernel */ + if (!sscreen->info.is_amdgpu || sscreen->info.drm_minor < 6) { + si_pm4_cmd_begin(pm4, PKT3_CONTEXT_CONTROL); + si_pm4_cmd_add(pm4, CONTEXT_CONTROL_LOAD_ENABLE(1)); + si_pm4_cmd_add(pm4, CONTEXT_CONTROL_SHADOW_ENABLE(1)); + si_pm4_cmd_end(pm4, false); + } if (has_clear_state) { si_pm4_cmd_begin(pm4, PKT3_CLEAR_STATE); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
