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

drm/nouveau/gr/gf100-: virtualise init_tex_hww_esr 



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

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

+10 −1
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_tex_hww_esr(struct gf100_gr *gr, int tpc, int gpc)

{

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

	nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000);

}



void

gf100_gr_init_419eb4(struct gf100_gr *gr)

{
@@ -2082,7 +2089,8 @@ gf100_gr_init(struct gf100_gr *gr) 
		for (tpc = 0; tpc < gr->tpc_nr[gpc]; tpc++) {

			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x508), 0xffffffff);

			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x50c), 0xffffffff);

			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000);

			if (gr->func->init_tex_hww_esr)

				gr->func->init_tex_hww_esr(gr, gpc, tpc);

			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000);

			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x644), 0x001ffffe);

			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x64c), 0x0000000f);
@@ -2143,6 +2151,7 @@ gf100_gr = { 
	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.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
@@ -138,6 +138,7 @@ struct gf100_gr_func { 
	void (*init_419eb4)(struct gf100_gr *);

	void (*init_419c9c)(struct gf100_gr *);

	void (*init_ppc_exceptions)(struct gf100_gr *);

	void (*init_tex_hww_esr)(struct gf100_gr *, int gpc, int tpc);

	void (*set_hww_esr_report_mask)(struct gf100_gr *);

	const struct gf100_gr_pack *mmio;

	struct {
@@ -162,6 +163,7 @@ 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 gf100_gr_init_tex_hww_esr(struct gf100_gr *, int, int);



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
@@ -123,6 +123,7 @@ gf104_gr = { 
	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.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
@@ -121,6 +121,7 @@ gf108_gr = { 
	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.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
@@ -95,6 +95,7 @@ gf110_gr = { 
	.init_40601c = gf100_gr_init_40601c,

	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,