Commit 0033f15b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: drop fuc_ prefix on sw init 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a2bfb50e

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

+6 −6
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 


	nvkm_mc_unk260(device, 0);



	if (!gr->fuc_sw_ctx) {

	if (!gr->sw_ctx) {

		gf100_gr_mmio(gr, grctx->hub);

		gf100_gr_mmio(gr, grctx->gpc_0);

		gf100_gr_mmio(gr, grctx->zcull);
@@ -1376,7 +1376,7 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
		gf100_gr_mmio(gr, grctx->tpc);

		gf100_gr_mmio(gr, grctx->ppc);

	} else {

		gf100_gr_mmio(gr, gr->fuc_sw_ctx);

		gf100_gr_mmio(gr, gr->sw_ctx);

	}



	gf100_gr_wait_idle(gr);
@@ -1395,8 +1395,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	gf100_gr_wait_idle(gr);



	if (grctx->r400088) grctx->r400088(gr, false);

	if (gr->fuc_bundle)

		gf100_gr_icmd(gr, gr->fuc_bundle);

	if (gr->bundle)

		gf100_gr_icmd(gr, gr->bundle);

	else

		gf100_gr_icmd(gr, grctx->icmd);

	if (grctx->sw_veid_bundle_init)
@@ -1405,8 +1405,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 


	nvkm_wr32(device, 0x404154, idle_timeout);



	if (gr->fuc_method)

		gf100_gr_mthd(gr, gr->fuc_method);

	if (gr->method)

		gf100_gr_mthd(gr, gr->method);

	else

		gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device, 1);

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	u32 idle_timeout;

	int i;



	gf100_gr_mmio(gr, gr->fuc_sw_ctx);

	gf100_gr_mmio(gr, gr->sw_ctx);



	gf100_gr_wait_idle(gr);
@@ -56,10 +56,10 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_wait_idle(gr);



	gf100_gr_mthd(gr, gr->fuc_method);

	gf100_gr_mthd(gr, gr->method);

	gf100_gr_wait_idle(gr);



	gf100_gr_icmd(gr, gr->fuc_bundle);

	gf100_gr_icmd(gr, gr->bundle);

	grctx->pagepool(info);

	grctx->bundle(info);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	u32 idle_timeout;

	int i, tmp;



	gf100_gr_mmio(gr, gr->fuc_sw_ctx);

	gf100_gr_mmio(gr, gr->sw_ctx);



	gf100_gr_wait_idle(gr);
@@ -59,10 +59,10 @@ gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_wait_idle(gr);



	gf100_gr_mthd(gr, gr->fuc_method);

	gf100_gr_mthd(gr, gr->method);

	gf100_gr_wait_idle(gr);



	gf100_gr_icmd(gr, gr->fuc_bundle);

	gf100_gr_icmd(gr, gr->bundle);

	grctx->pagepool(info);

	grctx->bundle(info);

}

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

+6 −12
Original line number Diff line number Diff line
@@ -2013,12 +2013,6 @@ gf100_gr_fini_(struct nvkm_gr *base, bool suspend) 
	return 0;

}



static void

gf100_gr_dtor_init(struct gf100_gr_pack *pack)

{

	vfree(pack);

}



void *

gf100_gr_dtor(struct nvkm_gr *base)

{
@@ -2034,10 +2028,10 @@ gf100_gr_dtor(struct nvkm_gr *base) 
	nvkm_blob_dtor(&gr->fuc41ac);

	nvkm_blob_dtor(&gr->fuc41ad);



	gf100_gr_dtor_init(gr->fuc_bundle);

	gf100_gr_dtor_init(gr->fuc_method);

	gf100_gr_dtor_init(gr->fuc_sw_ctx);

	gf100_gr_dtor_init(gr->fuc_sw_nonctx);

	vfree(gr->bundle);

	vfree(gr->method);

	vfree(gr->sw_ctx);

	vfree(gr->sw_nonctx);



	return gr;

}
@@ -2303,8 +2297,8 @@ gf100_gr_init(struct gf100_gr *gr) 


	gr->func->init_gpc_mmu(gr);



	if (gr->fuc_sw_nonctx)

		gf100_gr_mmio(gr, gr->fuc_sw_nonctx);

	if (gr->sw_nonctx)

		gf100_gr_mmio(gr, gr->sw_nonctx);

	else

		gf100_gr_mmio(gr, gr->func->mmio);

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

+4 −4
Original line number Diff line number Diff line
@@ -97,10 +97,10 @@ struct gf100_gr { 
	 * Used if the register packs are loaded from NVIDIA fw instead of

	 * using hardcoded arrays. To be allocated with vzalloc().

	 */

	struct gf100_gr_pack *fuc_sw_nonctx;

	struct gf100_gr_pack *fuc_sw_ctx;

	struct gf100_gr_pack *fuc_bundle;

	struct gf100_gr_pack *fuc_method;

	struct gf100_gr_pack *sw_nonctx;

	struct gf100_gr_pack *sw_ctx;

	struct gf100_gr_pack *bundle;

	struct gf100_gr_pack *method;



	struct gf100_gr_zbc_color zbc_color[NVKM_LTC_MAX_ZBC_CNT];

	struct gf100_gr_zbc_depth zbc_depth[NVKM_LTC_MAX_ZBC_CNT];