From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 1 Jun 2022 10:48:10 +0000 (+1000)
Subject: drm/nouveau/gr/gf100-: wfi after register-bashing golden init
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=40bbee55c114750d2995028603902d7d2ed35ebd;p=linux.git

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>
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
index 9795896763610..edd4b867a1e22 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