Commit 201ed6f6 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: delete duplicated grctx init code 



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

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

+0 −2
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ void gk104_grctx_generate_alpha_beta_tables(struct gf100_gr *); 
void gk104_grctx_generate_gpc_tpc_nr(struct gf100_gr *);



extern const struct gf100_grctx_func gk20a_grctx;

void gk104_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);

void gk104_grctx_generate_bundle(struct gf100_grctx *);

void gk104_grctx_generate_pagepool(struct gf100_grctx *);

void gk104_grctx_generate_patch_ltc(struct gf100_grctx *);
@@ -137,7 +136,6 @@ void gm200_grctx_generate_r419a3c(struct gf100_gr *); 
extern const struct gf100_grctx_func gm20b_grctx;



extern const struct gf100_grctx_func gp100_grctx;

void gp100_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);

void gp100_grctx_generate_pagepool(struct gf100_grctx *);

void gp100_grctx_generate_smid_config(struct gf100_gr *);

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

+1 −31
Original line number Diff line number Diff line
@@ -286,39 +286,9 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info) 
	}

}



static void

gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)

{

	struct nvkm_device *device = gr->base.engine.subdev.device;

	const struct gf100_grctx_func *grctx = gr->func->grctx;

	u32 idle_timeout;



	nvkm_mc_unk260(device, 0);



	gf100_gr_mmio(gr, grctx->hub);

	gf100_gr_mmio(gr, grctx->gpc);

	gf100_gr_mmio(gr, grctx->zcull);

	gf100_gr_mmio(gr, grctx->tpc);

	gf100_gr_mmio(gr, grctx->ppc);



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



	grctx->bundle(info);

	grctx->pagepool(info);

	grctx->attrib(info);

	grctx->unkn(gr);



	gf100_grctx_generate_floorsweep(gr);



	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device, 1);

}



const struct gf100_grctx_func

gf117_grctx = {

	.main  = gf117_grctx_generate_main,

	.main  = gf100_grctx_generate_main,

	.unkn  = gk104_grctx_generate_unkn,

	.hub   = gf117_grctx_pack_hub,

	.gpc   = gf117_grctx_pack_gpc,

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

+1 −33
Original line number Diff line number Diff line
@@ -921,38 +921,6 @@ gk104_grctx_generate_gpc_tpc_nr(struct gf100_gr *gr) 
	nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);

}



void

gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)

{

	struct nvkm_device *device = gr->base.engine.subdev.device;

	const struct gf100_grctx_func *grctx = gr->func->grctx;

	u32 idle_timeout;



	nvkm_mc_unk260(device, 0);



	gf100_gr_mmio(gr, grctx->hub);

	gf100_gr_mmio(gr, grctx->gpc);

	gf100_gr_mmio(gr, grctx->zcull);

	gf100_gr_mmio(gr, grctx->tpc);

	gf100_gr_mmio(gr, grctx->ppc);



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



	grctx->bundle(info);

	grctx->pagepool(info);

	grctx->attrib(info);

	grctx->unkn(gr);



	gf100_grctx_generate_floorsweep(gr);



	gf100_gr_icmd(gr, grctx->icmd);

	nvkm_wr32(device, 0x404154, idle_timeout);

	gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device, 1);



	grctx->r418800(gr);

}



void

gk104_grctx_generate_alpha_beta_tables(struct gf100_gr *gr)

{
@@ -1002,7 +970,7 @@ gk104_grctx_generate_alpha_beta_tables(struct gf100_gr *gr) 


const struct gf100_grctx_func

gk104_grctx = {

	.main  = gk104_grctx_generate_main,

	.main  = gf100_grctx_generate_main,

	.unkn  = gk104_grctx_generate_unkn,

	.hub   = gk104_grctx_pack_hub,

	.gpc   = gk104_grctx_pack_gpc,

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

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ gk110_grctx_generate_r419eb0(struct gf100_gr *gr) 


const struct gf100_grctx_func

gk110_grctx = {

	.main  = gk104_grctx_generate_main,

	.main  = gf100_grctx_generate_main,

	.unkn  = gk104_grctx_generate_unkn,

	.hub   = gk110_grctx_pack_hub,

	.gpc   = gk110_grctx_pack_gpc,

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ gk110b_grctx_pack_tpc[] = { 


const struct gf100_grctx_func

gk110b_grctx = {

	.main  = gk104_grctx_generate_main,

	.main  = gf100_grctx_generate_main,

	.unkn  = gk104_grctx_generate_unkn,

	.hub   = gk110_grctx_pack_hub,

	.gpc   = gk110_grctx_pack_gpc,