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

drm/nouveau/gr/gf100-: virtualise rop_mapping 



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

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

+4 −2
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ gf100_grctx_generate_r4060a8(struct gf100_gr *gr) 
}



void

gf100_grctx_generate_r418bb8(struct gf100_gr *gr)

gf100_grctx_generate_rop_mapping(struct gf100_gr *gr)

{

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

	u32 data[6] = {}, data2[2] = {};
@@ -1241,6 +1241,8 @@ gf100_grctx_generate_floorsweep(struct gf100_gr *gr) 


	if (func->r4060a8)

		func->r4060a8(gr);



	func->rop_mapping(gr);

}



void
@@ -1272,7 +1274,6 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 
	grctx->unkn(gr);



	gf100_grctx_generate_floorsweep(gr);

	gf100_grctx_generate_r418bb8(gr);

	gf100_grctx_generate_r406800(gr);



	gf100_gr_icmd(gr, grctx->icmd);
@@ -1424,4 +1425,5 @@ gf100_grctx = { 
	.sm_id = gf100_grctx_generate_sm_id,

	.tpc_nr = gf100_grctx_generate_tpc_nr,

	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

};

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

+3 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct gf100_grctx_func { 
	void (*sm_id)(struct gf100_gr *, int gpc, int tpc, int sm);

	void (*tpc_nr)(struct gf100_gr *, int gpc);

	void (*r4060a8)(struct gf100_gr *);

	void (*rop_mapping)(struct gf100_gr *);

};



extern const struct gf100_grctx_func gf100_grctx;
@@ -64,11 +65,11 @@ void gf100_grctx_generate_pagepool(struct gf100_grctx *); 
void gf100_grctx_generate_attrib(struct gf100_grctx *);

void gf100_grctx_generate_unkn(struct gf100_gr *);

void gf100_grctx_generate_floorsweep(struct gf100_gr *);

void gf100_grctx_generate_r418bb8(struct gf100_gr *);

void gf100_grctx_generate_r406800(struct gf100_gr *);

void gf100_grctx_generate_sm_id(struct gf100_gr *, int, int, int);

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



extern const struct gf100_grctx_func gf108_grctx;

void gf108_grctx_generate_attrib(struct gf100_grctx *);
@@ -79,6 +80,7 @@ extern const struct gf100_grctx_func gf110_grctx; 


extern const struct gf100_grctx_func gf117_grctx;

void gf117_grctx_generate_attrib(struct gf100_grctx *);

void gf117_grctx_generate_rop_mapping(struct gf100_gr *);



extern const struct gf100_grctx_func gf119_grctx;
@@ -89,7 +91,6 @@ 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 *);

void gk104_grctx_generate_unkn(struct gf100_gr *);

void gk104_grctx_generate_r418bb8(struct gf100_gr *);



void gm107_grctx_generate_bundle(struct gf100_grctx *);

void gm107_grctx_generate_pagepool(struct gf100_grctx *);

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

+1 −0
Original line number Diff line number Diff line
@@ -99,4 +99,5 @@ gf104_grctx = { 
	.sm_id = gf100_grctx_generate_sm_id,

	.tpc_nr = gf100_grctx_generate_tpc_nr,

	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -797,4 +797,5 @@ gf108_grctx = { 
	.sm_id = gf100_grctx_generate_sm_id,

	.tpc_nr = gf100_grctx_generate_tpc_nr,

	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -350,4 +350,5 @@ gf110_grctx = { 
	.sm_id = gf100_grctx_generate_sm_id,

	.tpc_nr = gf100_grctx_generate_tpc_nr,

	.r4060a8 = gf100_grctx_generate_r4060a8,

	.rop_mapping = gf100_grctx_generate_rop_mapping,

};