From: Ben Skeggs Date: Thu, 23 Jul 2020 10:10:42 +0000 (+1000) Subject: drm/nouveau/kms/tu102: wait for core update to complete when assigning windows X-Git-Tag: v5.8~25^2~1^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=705d9d022949e3cdae82d89db6a8fc773eb23dad;p=thirdparty%2Fkernel%2Flinux.git 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: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index dc90d4f61b7fa..800b7757252e3 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -2073,7 +2073,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state) */ if (core->assign_windows) { core->func->wndw.owner(core); - core->func->update(core, interlock, false); + nv50_disp_atomic_commit_core(state, interlock); core->assign_windows = false; interlock[NV50_DISP_INTERLOCK_CORE] = 0; }