drm/nouveau/disp: update SOR routing immediately on acquire()

- was previously delayed until second supervisor interrupt

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Danilo Krummrich <me@dakr.org>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-15-lyude@redhat.com

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
index 5b55598e09c850f57144eb7e3dffd136e111ca13..b288ea6658da65de60331c81f3cd4a56365853b5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
@@ -48,8 +48,8 @@ nvkm_outp_route(struct nvkm_disp *disp)
 
        list_for_each_entry(ior, &disp->iors, head) {
                if ((outp = ior->asy.outp)) {
-                       OUTP_DBG(outp, "acquire %s", ior->name);
                        if (ior->asy.outp != ior->arm.outp) {
+                               OUTP_DBG(outp, "acquire %s", ior->name);
                                if (ior->func->route.set)
                                        ior->func->route.set(outp, ior);
                                ior->arm.outp = ior->asy.outp;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
index d71bc188047e30e7acb7ebf307f8cb89c69f1bdd..042a43c22061eefce818f395fd28f61e7595acc0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
@@ -235,6 +235,8 @@ nvkm_uoutp_mthd_acquire(struct nvkm_outp *outp, void *argv, u32 argc)
        if (ret)
                return ret;
 
+       nvkm_outp_route(outp->disp);
+
        args->v0.or = outp->ior->id;
        args->v0.link = outp->ior->asy.link;
        return 0;