Commit 75e637db authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/gr/gv100-: move init_419bd8() after sw_ctx load

Match RM.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 81d4201e
...@@ -1359,6 +1359,9 @@ gf100_grctx_generate_main(struct gf100_gr_chan *chan) ...@@ -1359,6 +1359,9 @@ gf100_grctx_generate_main(struct gf100_gr_chan *chan)
gf100_gr_mmio(gr, gr->sw_ctx); gf100_gr_mmio(gr, gr->sw_ctx);
} }
if (gr->func->init_419bd8)
gr->func->init_419bd8(gr);
gf100_gr_wait_idle(gr); gf100_gr_wait_idle(gr);
idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000); idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);
......
...@@ -2333,9 +2333,6 @@ gf100_gr_init(struct gf100_gr *gr) ...@@ -2333,9 +2333,6 @@ gf100_gr_init(struct gf100_gr *gr)
nvkm_mask(device, 0x400500, 0x00010001, 0x00000000); nvkm_mask(device, 0x400500, 0x00010001, 0x00000000);
if (gr->func->init_419bd8)
gr->func->init_419bd8(gr);
gr->func->init_gpc_mmu(gr); gr->func->init_gpc_mmu(gr);
if (gr->sw_nonctx) if (gr->sw_nonctx)
......
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