Revert "radeonsi: don't emit PKT3_CONTEXT_CONTROL on amdgpu"

This reverts commit 5a2e65be89d97ed5d7263f0296ea69ae8517187b.

Even though CONTEXT_CONTROL is emitted by the kernel, CONTEXT_CONTROL
still needs to be emitted by the UMD, or else the driver will hang

Cc: 19.2 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Thong Thai <thong.thai@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index a1e4a5b9cee28fa0c559d4a5092d8477da1d2e30..1d086b65fa492d21a2827e6cecdac046ca52c63b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -5412,13 +5412,10 @@ static void si_init_config(struct si_context *sctx)
        if (!pm4)
                return;
 
-       /* 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);
-       }
+       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);