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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2018-05-08 20:39:46 +10:00
parent 525230cb20
commit aedc49fd0e
1 changed files with 9 additions and 5 deletions

View File

@ -1239,11 +1239,15 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
nvkm_mc_unk260(device, 0); nvkm_mc_unk260(device, 0);
gf100_gr_mmio(gr, grctx->hub); if (!gr->fuc_sw_ctx) {
gf100_gr_mmio(gr, grctx->gpc); gf100_gr_mmio(gr, grctx->hub);
gf100_gr_mmio(gr, grctx->zcull); gf100_gr_mmio(gr, grctx->gpc);
gf100_gr_mmio(gr, grctx->tpc); gf100_gr_mmio(gr, grctx->zcull);
gf100_gr_mmio(gr, grctx->ppc); gf100_gr_mmio(gr, grctx->tpc);
gf100_gr_mmio(gr, grctx->ppc);
} else {
gf100_gr_mmio(gr, gr->fuc_sw_ctx);
}
idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000); idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);