Commit 705d9d02 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/tu102: wait for core update to complete when assigning windows

Fixes a race on Turing between the core cross-channel error checks and
the following window update.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 05088314
...@@ -2073,7 +2073,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) ...@@ -2073,7 +2073,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
*/ */
if (core->assign_windows) { if (core->assign_windows) {
core->func->wndw.owner(core); core->func->wndw.owner(core);
core->func->update(core, interlock, false); nv50_disp_atomic_commit_core(state, interlock);
core->assign_windows = false; core->assign_windows = false;
interlock[NV50_DISP_INTERLOCK_CORE] = 0; interlock[NV50_DISP_INTERLOCK_CORE] = 0;
} }
......
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