diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 20:39:46 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 15:01:22 +1000 |
| commit | 6f63a5fb1ec37cd55d7c886ac7d76f95a4cea2ce (patch) | |
| tree | 4ed1c2c00fdeb0b1c1492f58396c9c3d094302a2 /drivers/gpu/drm/nouveau | |
| parent | 1246f1dc224a2c4ab61a1454cff669918b92e9da (diff) | |
drm/nouveau/gr/gf100-: support firmware-provided sw_nonctx everywhere
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); |