Commit c4a2b638 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-gf119: modify max_ways_evict where required 



I don't think this is done after Fermi, NVGPU used to do it but removed
the code, and I've not seen RM traces touching it either.

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

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

+12 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,15 @@ gf100_grctx_generate_rop_mapping(struct gf100_gr *gr) 
		nvkm_wr32(device, 0x40780c + (i * 4), data[i]);

}



void

gf100_grctx_generate_max_ways_evict(struct gf100_gr *gr)

{

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

	u32 fbps = nvkm_rd32(device, 0x121c74);

	if (fbps == 1)

		nvkm_mask(device, 0x17e91c, 0x001f0000, 0x00090000);

}



static const u32

gf100_grctx_alpha_beta_map[17][32] = {

	[1] = {
@@ -1349,6 +1358,8 @@ gf100_grctx_generate_floorsweep(struct gf100_gr *gr) 


	if (func->alpha_beta_tables)

		func->alpha_beta_tables(gr);

	if (func->max_ways_evict)

		func->max_ways_evict(gr);

}



void
@@ -1532,4 +1543,5 @@ gf100_grctx = { 
	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

	.alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,

	.max_ways_evict = gf100_grctx_generate_max_ways_evict,

};

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

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

	void (*rop_mapping)(struct gf100_gr *);

	void (*alpha_beta_tables)(struct gf100_gr *);

	void (*max_ways_evict)(struct gf100_gr *);

};



extern const struct gf100_grctx_func gf100_grctx;
@@ -71,6 +72,7 @@ void gf100_grctx_generate_tpc_nr(struct gf100_gr *, int); 
void gf100_grctx_generate_r4060a8(struct gf100_gr *);

void gf100_grctx_generate_rop_mapping(struct gf100_gr *);

void gf100_grctx_generate_alpha_beta_tables(struct gf100_gr *);

void gf100_grctx_generate_max_ways_evict(struct gf100_gr *);



extern const struct gf100_grctx_func gf108_grctx;

void gf108_grctx_generate_attrib(struct gf100_grctx *);

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

+1 −0
Original line number Diff line number Diff line
@@ -101,4 +101,5 @@ gf104_grctx = { 
	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

	.alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,

	.max_ways_evict = gf100_grctx_generate_max_ways_evict,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -799,4 +799,5 @@ gf108_grctx = { 
	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

	.alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,

	.max_ways_evict = gf100_grctx_generate_max_ways_evict,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -352,4 +352,5 @@ gf110_grctx = { 
	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

	.alpha_beta_tables = gf100_grctx_generate_alpha_beta_tables,

	.max_ways_evict = gf100_grctx_generate_max_ways_evict,

};