From 6f63a5fb1ec37cd55d7c886ac7d76f95a4cea2ce Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 8 May 2018 20:39:46 +1000 Subject: [PATCH] drm/nouveau/gr/gf100-: support firmware-provided sw_nonctx everywhere Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- 2.45.2