Commit 99a3c67e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-gf119: update 419cb8 where required 



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

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

+11 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,13 @@ gf100_grctx_mmio_item(struct gf100_grctx *info, u32 addr, u32 data, 
	nvkm_wr32(device, addr, data);

}



void

gf100_grctx_generate_r419cb8(struct gf100_gr *gr)

{

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

	nvkm_mask(device, 0x419cb8, 0x00007c00, 0x00000000);

}



void

gf100_grctx_generate_bundle(struct gf100_grctx *info)

{
@@ -1416,6 +1423,9 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	else

		gf100_gr_mthd(gr, grctx->mthd);

	nvkm_mc_unk260(device, 1);



	if (grctx->r419cb8)

		grctx->r419cb8(gr);

}



#define CB_RESERVED 0x80000
@@ -1564,4 +1574,5 @@ gf100_grctx = { 
	.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,

	.r419cb8 = gf100_grctx_generate_r419cb8,

};

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

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ struct gf100_grctx_func { 
	void (*r419f78)(struct gf100_gr *);

	void (*tpc_mask)(struct gf100_gr *);

	void (*smid_config)(struct gf100_gr *);

	/* misc other things */

	void (*r419cb8)(struct gf100_gr *);

};



extern const struct gf100_grctx_func gf100_grctx;
@@ -79,6 +81,7 @@ 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 *);

void gf100_grctx_generate_r419cb8(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
@@ -102,4 +102,5 @@ gf104_grctx = { 
	.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,

	.r419cb8 = gf100_grctx_generate_r419cb8,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -800,4 +800,5 @@ gf108_grctx = { 
	.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,

	.r419cb8 = gf100_grctx_generate_r419cb8,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -353,4 +353,5 @@ gf110_grctx = { 
	.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,

	.r419cb8 = gf100_grctx_generate_r419cb8,

};