diff options
| author | Thong Thai <[email protected]> | 2019-08-28 17:02:26 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-08-29 17:27:15 -0400 |
| commit | 2a3a5604076e94445079a0b25aa108ee99b5fcba (patch) | |
| tree | 68da11e8242510b043545af804b68568ff1269bc /src/gallium/drivers | |
| parent | 9ad4a2eac5471404ae59fabefb7b8e1bb38d8d0f (diff) | |
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 <[email protected]>
Signed-off-by: Thong Thai <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index a1e4a5b9cee..1d086b65fa4 100644 --- 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); |