Commit 0e5a5e86 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/gr/gf100-: support firmware-provided bundle/method everywhere

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fc360764
...@@ -1404,9 +1404,17 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) ...@@ -1404,9 +1404,17 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
gf100_grctx_generate_floorsweep(gr); gf100_grctx_generate_floorsweep(gr);
gf100_gr_icmd(gr, grctx->icmd); if (gr->fuc_bundle)
gf100_gr_icmd(gr, gr->fuc_bundle);
else
gf100_gr_icmd(gr, grctx->icmd);
nvkm_wr32(device, 0x404154, idle_timeout); nvkm_wr32(device, 0x404154, idle_timeout);
gf100_gr_mthd(gr, grctx->mthd);
if (gr->fuc_method)
gf100_gr_mthd(gr, gr->fuc_method);
else
gf100_gr_mthd(gr, grctx->mthd);
nvkm_mc_unk260(device, 1); nvkm_mc_unk260(device, 1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment