Commit 45d954c0 authored by Ben Skeggs's avatar Ben Skeggs Committed by Lyude Paul

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

- was previously delayed until second supervisor interrupt
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarDanilo Krummrich <me@dakr.org>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-15-lyude@redhat.com
parent cefc3c14
...@@ -48,8 +48,8 @@ nvkm_outp_route(struct nvkm_disp *disp) ...@@ -48,8 +48,8 @@ nvkm_outp_route(struct nvkm_disp *disp)
list_for_each_entry(ior, &disp->iors, head) { list_for_each_entry(ior, &disp->iors, head) {
if ((outp = ior->asy.outp)) { if ((outp = ior->asy.outp)) {
OUTP_DBG(outp, "acquire %s", ior->name);
if (ior->asy.outp != ior->arm.outp) { if (ior->asy.outp != ior->arm.outp) {
OUTP_DBG(outp, "acquire %s", ior->name);
if (ior->func->route.set) if (ior->func->route.set)
ior->func->route.set(outp, ior); ior->func->route.set(outp, ior);
ior->arm.outp = ior->asy.outp; ior->arm.outp = ior->asy.outp;
......
...@@ -235,6 +235,8 @@ nvkm_uoutp_mthd_acquire(struct nvkm_outp *outp, void *argv, u32 argc) ...@@ -235,6 +235,8 @@ nvkm_uoutp_mthd_acquire(struct nvkm_outp *outp, void *argv, u32 argc)
if (ret) if (ret)
return ret; return ret;
nvkm_outp_route(outp->disp);
args->v0.or = outp->ior->id; args->v0.or = outp->ior->id;
args->v0.link = outp->ior->asy.link; args->v0.link = outp->ior->asy.link;
return 0; return 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