diff options
| author | Thong Thai <thong.thai@amd.com> | 2019-08-28 17:02:26 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-09-04 11:57:03 -0700 |
| commit | ec74c76a1a52c8536b85cbfcad851789b94979c2 (patch) | |
| tree | ec0a23867d62c3b9f627c8e67c227f5c7e5750b3 | |
| parent | 6934bc4f0800ab7154c6a2efa541f073cda7a6b9 (diff) | |
| download | mesa-ec74c76a1a52c8536b85cbfcad851789b94979c2.tar.gz | |
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>
(cherry picked from commit 2a3a5604076e94445079a0b25aa108ee99b5fcba)
| -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 965ebd18c54..e4372a1288e 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -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); |