fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-21 18:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
This reverts commit 5a2e65be89.

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>
This commit is contained in:
Thong Thai 2019-08-28 17:02:26 -04:00 • committed by Marek Olšák
parent 9ad4a2eac5
commit 2a3a560407
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/radeonsi/si_state.c
View file

@ -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);