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

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

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c

+3 −0
Original line number Diff line number Diff line
@@ -1359,6 +1359,9 @@ gf100_grctx_generate_main(struct gf100_gr_chan *chan) 
		gf100_gr_mmio(gr, gr->sw_ctx);

	}



	if (gr->func->init_419bd8)

		gr->func->init_419bd8(gr);



	gf100_gr_wait_idle(gr);



	idle_timeout = nvkm_mask(device, 0x404154, 0xffffffff, 0x00000000);

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

+0 −3
Original line number Diff line number Diff line
@@ -2333,9 +2333,6 @@ gf100_gr_init(struct gf100_gr *gr) 


	nvkm_mask(device, 0x400500, 0x00010001, 0x00000000);



	if (gr->func->init_419bd8)

		gr->func->init_419bd8(gr);



	gr->func->init_gpc_mmu(gr);



	if (gr->sw_nonctx)