summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2022-06-01 20:48:10 +1000
committerBen Skeggs <bskeggs@redhat.com>2022-11-09 10:45:11 +1000
commit40bbee55c114750d2995028603902d7d2ed35ebd (patch)
tree6755855831bc16f1449f95d1e0c93aa47b1e5eff /drivers/gpu/drm/nouveau
parent0d7557072414af191cefbaa7c908e1c09f5b7d7b (diff)
downloadlinux-stable-40bbee55c114750d2995028603902d7d2ed35ebd.tar.gz
linux-stable-40bbee55c114750d2995028603902d7d2ed35ebd.tar.bz2
linux-stable-40bbee55c114750d2995028603902d7d2ed35ebd.zip
drm/nouveau/gr/gf100-: wfi after register-bashing golden init
Match RM. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
index 979589676361..edd4b867a1e2 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1410,6 +1410,8 @@ gf100_grctx_generate_main(struct gf100_gr_chan *chan)
grctx->r408840(gr);
if (grctx->r419c0c)
grctx->r419c0c(gr);
+
+ gf100_gr_wait_idle(gr);
}
#define CB_RESERVED 0x80000