drm/nouveau/gr/gf100-: support firmware-provided sw_nonctx everywhere

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 5be4111b06686c6a5019c42220b81424f53e0144..eb50cfc1b53fcf2174552f8a693a7480071e2676 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -1941,7 +1941,10 @@ gf100_gr_init(struct gf100_gr *gr)
 
        gr->func->init_gpc_mmu(gr);
 
-       gf100_gr_mmio(gr, gr->func->mmio);
+       if (gr->fuc_sw_nonctx)
+               gf100_gr_mmio(gr, gr->fuc_sw_nonctx);
+       else
+               gf100_gr_mmio(gr, gr->func->mmio);
 
        nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);