diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2023-09-20 00:56:09 +0300 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2023-09-20 01:22:00 +0300 |
| commit | 45d954c05da1e56b534b28a64c2a7b99576fbd57 (patch) | |
| tree | 8eb4fe302c14f0b1aade59d67c15394358cec020 /drivers/gpu | |
| parent | cefc3c1452b19920038b44ae257d6a8af2d4da51 (diff) | |
| download | linux-45d954c05da1e56b534b28a64c2a7b99576fbd57.tar.xz | |
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
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c index 5b55598e09c8..b288ea6658da 100644 --- 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 d71bc188047e..042a43c22061 100644 --- 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; |