From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 8 May 2018 10:39:46 +0000 (+1000)
Subject: drm/nouveau/gr/gf100-: support firmware-provided sw_nonctx everywhere
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6f63a5fb1ec37cd55d7c886ac7d76f95a4cea2ce;p=openwrt%2Fstaging%2Fblogic.git

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 5be4111b0668..eb50cfc1b53f 100644
--- 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);