Commit 60c0264a authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: virtualise gpc_tpc_nr 



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

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

+2 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,8 @@ gf100_grctx_generate_floorsweep(struct gf100_gr *gr) 
		func->dist_skip_table(gr);

	if (func->r406500)

		func->r406500(gr);

	if (func->gpc_tpc_nr)

		func->gpc_tpc_nr(gr);

}



void

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

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct gf100_grctx_func { 
	void (*max_ways_evict)(struct gf100_gr *);

	void (*dist_skip_table)(struct gf100_gr *);

	void (*r406500)(struct gf100_gr *);

	void (*gpc_tpc_nr)(struct gf100_gr *);

};



extern const struct gf100_grctx_func gf100_grctx;
@@ -92,6 +93,7 @@ extern const struct gf100_grctx_func gf119_grctx; 


extern const struct gf100_grctx_func gk104_grctx;

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 *);

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

+8 −1
Original line number Diff line number Diff line
@@ -892,6 +892,13 @@ gk104_grctx_generate_unkn(struct gf100_gr *gr) 
	nvkm_mask(device, 0x419c00, 0x00000008, 0x00000008);

}



void

gk104_grctx_generate_gpc_tpc_nr(struct gf100_gr *gr)

{

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

	nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);

}



void

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

{
@@ -916,7 +923,6 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 


	gf100_grctx_generate_floorsweep(gr);



	nvkm_wr32(device, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);

	nvkm_mask(device, 0x419f78, 0x00000001, 0x00000000);



	gf100_gr_icmd(gr, grctx->icmd);
@@ -1003,4 +1009,5 @@ gk104_grctx = { 
	.rop_mapping = gf117_grctx_generate_rop_mapping,

	.alpha_beta_tables = gk104_grctx_generate_alpha_beta_tables,

	.dist_skip_table = gf117_grctx_generate_dist_skip_table,

	.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -836,4 +836,5 @@ gk110_grctx = { 
	.rop_mapping = gf117_grctx_generate_rop_mapping,

	.alpha_beta_tables = gk104_grctx_generate_alpha_beta_tables,

	.dist_skip_table = gf117_grctx_generate_dist_skip_table,

	.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -97,4 +97,5 @@ gk110b_grctx = { 
	.rop_mapping = gf117_grctx_generate_rop_mapping,

	.alpha_beta_tables = gk104_grctx_generate_alpha_beta_tables,

	.dist_skip_table = gf117_grctx_generate_dist_skip_table,

	.gpc_tpc_nr = gk104_grctx_generate_gpc_tpc_nr,

};