Commit 2b297b0d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: virtualise init_40601c 



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

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

+11 −1
Original line number Diff line number Diff line
@@ -1914,6 +1914,12 @@ gf100_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, 
	return 0;

}



void

gf100_gr_init_40601c(struct gf100_gr *gr)

{

	nvkm_wr32(gr->base.engine.subdev.device, 0x40601c, 0xc0000000);

}



void

gf100_gr_init_fecs_exceptions(struct gf100_gr *gr)

{
@@ -2024,7 +2030,10 @@ gf100_gr_init(struct gf100_gr *gr) 
	nvkm_wr32(device, 0x404000, 0xc0000000);

	nvkm_wr32(device, 0x404600, 0xc0000000);

	nvkm_wr32(device, 0x408030, 0xc0000000);

	nvkm_wr32(device, 0x40601c, 0xc0000000);



	if (gr->func->init_40601c)

		gr->func->init_40601c(gr);



	nvkm_wr32(device, 0x404490, 0xc0000000);

	nvkm_wr32(device, 0x406018, 0xc0000000);

	nvkm_wr32(device, 0x405840, 0xc0000000);
@@ -2099,6 +2108,7 @@ gf100_gr = { 
	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.mmio = gf100_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,

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

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ struct gf100_gr_func { 
	void (*init_swdx_pes_mask)(struct gf100_gr *);

	void (*init_fecs_exceptions)(struct gf100_gr *);

	void (*init_ds_hww_esr_2)(struct gf100_gr *);

	void (*init_40601c)(struct gf100_gr *);

	void (*init_ppc_exceptions)(struct gf100_gr *);

	void (*set_hww_esr_report_mask)(struct gf100_gr *);

	const struct gf100_gr_pack *mmio;
@@ -154,6 +155,7 @@ void gf100_gr_init_vsc_stream_master(struct gf100_gr *); 
void gf100_gr_init_zcull(struct gf100_gr *);

void gf100_gr_init_num_active_ltcs(struct gf100_gr *);

void gf100_gr_init_fecs_exceptions(struct gf100_gr *);

void gf100_gr_init_40601c(struct gf100_gr *);



void gf117_gr_init_zcull(struct gf100_gr *);

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

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ gf104_gr = { 
	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.mmio = gf104_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ gf108_gr = { 
	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.mmio = gf108_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ gf110_gr = { 
	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,