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

Ben Skeggs · Ben Skeggs · commit 705d9d022949 · 2020-07-24T18:33:14.000+10:00
Fixes a race on Turing between the core cross-channel error checks and
the following window update.

Signed-off-by: Ben Skeggs &lt;bskeggs@redhat.com&gt;
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2073,7 +2073,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)`
`2073`	`2073`	`*/`
`2074`	`2074`	`if (core->assign_windows) {`
`2075`	`2075`	`core->func->wndw.owner(core);`
`2076`		`- core->func->update(core, interlock, false);`
	`2076`	`+ nv50_disp_atomic_commit_core(state, interlock);`
`2077`	`2077`	`core->assign_windows = false;`
`2078`	`2078`	`interlock[NV50_DISP_INTERLOCK_CORE] = 0;`
`2079`	`2079`	`}`