Commit 0a84a513 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: virtualise init_419eb4 + apply fixes from traces 



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

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

+10 −2
Original line number Diff line number Diff line
@@ -1914,6 +1914,13 @@ gf100_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, 
	return 0;

}



void

gf100_gr_init_419eb4(struct gf100_gr *gr)

{

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

	nvkm_mask(device, 0x419eb4, 0x00001000, 0x00001000);

}



void

gf100_gr_init_419cc0(struct gf100_gr *gr)

{
@@ -2059,8 +2066,8 @@ gf100_gr_init(struct gf100_gr *gr) 


	if (gr->func->init_419cc0)

		gr->func->init_419cc0(gr);



	nvkm_mask(device, 0x419eb4, 0x00001000, 0x00001000);

	if (gr->func->init_419eb4)

		gr->func->init_419eb4(gr);



	for (gpc = 0; gpc < gr->gpc_nr; gpc++) {

		nvkm_wr32(device, GPC_UNIT(gpc, 0x0420), 0xc0000000);
@@ -2130,6 +2137,7 @@ gf100_gr = { 
	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.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

+4 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct gf100_gr_func { 
	void (*init_40601c)(struct gf100_gr *);

	void (*init_sked_hww_esr)(struct gf100_gr *);

	void (*init_419cc0)(struct gf100_gr *);

	void (*init_419eb4)(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;
@@ -159,6 +160,7 @@ 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 gf100_gr_init_419cc0(struct gf100_gr *);

void gf100_gr_init_419eb4(struct gf100_gr *);



void gf117_gr_init_zcull(struct gf100_gr *);
@@ -168,6 +170,8 @@ void gk104_gr_init_rop_active_fbps(struct gf100_gr *); 
void gk104_gr_init_ppc_exceptions(struct gf100_gr *);

void gk104_gr_init_sked_hww_esr(struct gf100_gr *);



void gk110_gr_init_419eb4(struct gf100_gr *);



int gk20a_gr_init(struct gf100_gr *);



int gm200_gr_rops(struct gf100_gr *);

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

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ gf104_gr = { 
	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.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
@@ -120,6 +120,7 @@ gf108_gr = { 
	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.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
@@ -94,6 +94,7 @@ gf110_gr = { 
	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,