Commit ec74c76a authored by Thong Thai's avatar Thong Thai Committed by Dylan Baker

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

This reverts commit 5a2e65be.

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's avatarThong Thai <thong.thai@amd.com>
Reviewed-by: default avatarMarek Olšák <marek.olsak@amd.com>
(cherry picked from commit 2a3a5604)
parent 6934bc4f
......@@ -5419,13 +5419,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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment