]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/nouveau/kms/tu102: wait for core update to complete when assigning windows
authorBen Skeggs <bskeggs@redhat.com>
Thu, 23 Jul 2020 10:10:42 +0000 (20:10 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 24 Jul 2020 08:33:14 +0000 (18:33 +1000)
Fixes a race on Turing between the core cross-channel error checks and
the following window update.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/disp.c

index dc90d4f61b7fa59635bd440719053dc8a9a52c5c..800b7757252e3c92a97af405dc2d34f245a652da 100644 (file)
@@ -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;
        }