drm/nouveau/gr/gv100-: move init_419bd8() after sw_ctx load

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 a56f4f3f6c1e9670deca7dcadeef5941182edbae..7c318cdcb428b9c27aeef4cd6b8858a07579cecb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
@@ -1359,6 +1359,9 @@ gf100_grctx_generate_main(struct gf100_gr_chan *chan)
                gf100_gr_mmio(gr, gr->sw_ctx);
        }
 
+       if (gr->func->init_419bd8)
+               gr->func->init_419bd8(gr);
+
        gf100_gr_wait_idle(gr);
 
        idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 5ce83b915ebb9b6d5945d5be560096a3f7409e36..ddf06f5e75350db1bdee8492d10553db42a80d2d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -2333,9 +2333,6 @@ gf100_gr_init(struct gf100_gr *gr)
 
        nvkm_mask(device, 0x400500, 0x00010001, 0x00000000);
 
-       if (gr->func->init_419bd8)
-               gr->func->init_419bd8(gr);
-
        gr->func->init_gpc_mmu(gr);
 
        if (gr->sw_nonctx)