Commit 4615e9b4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: virtualise init_shader_exceptions 



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

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

+11 −3
Original line number Diff line number Diff line
@@ -1915,7 +1915,15 @@ gf100_gr_new_(const struct gf100_gr_func *func, struct nvkm_device *device, 
}



void

gf100_gr_init_tex_hww_esr(struct gf100_gr *gr, int tpc, int gpc)

gf100_gr_init_shader_exceptions(struct gf100_gr *gr, int gpc, int tpc)

{

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

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

	nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x64c), 0x0000000f);

}



void

gf100_gr_init_tex_hww_esr(struct gf100_gr *gr, int gpc, int tpc)

{

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

	nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000);
@@ -2094,8 +2102,7 @@ gf100_gr_init(struct gf100_gr *gr) 
			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000);

			if (gr->func->init_504430)

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

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

			nvkm_wr32(device, TPC_UNIT(gpc, tpc, 0x64c), 0x0000000f);

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

		}

		nvkm_wr32(device, GPC_UNIT(gpc, 0x2c90), 0xffffffff);

		nvkm_wr32(device, GPC_UNIT(gpc, 0x2c94), 0xffffffff);
@@ -2154,6 +2161,7 @@ gf100_gr = { 
	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

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

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

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

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

	void (*set_hww_esr_report_mask)(struct gf100_gr *);

	const struct gf100_gr_pack *mmio;

	struct {
@@ -165,6 +166,7 @@ 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 gf100_gr_init_shader_exceptions(struct gf100_gr *, int, int);



void gf117_gr_init_zcull(struct gf100_gr *);
@@ -177,6 +179,7 @@ void gk104_gr_init_sked_hww_esr(struct gf100_gr *); 
void gk110_gr_init_419eb4(struct gf100_gr *);



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

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



int gk20a_gr_init(struct gf100_gr *);
@@ -187,6 +190,7 @@ void gm200_gr_init_ds_hww_esr_2(struct gf100_gr *); 
int gp100_gr_init(struct gf100_gr *);

void gp100_gr_init_rop_active_fbps(struct gf100_gr *);

void gp100_gr_init_fecs_exceptions(struct gf100_gr *);

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



void gp102_gr_init_swdx_pes_mask(struct gf100_gr *);

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

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ gf104_gr = { 
	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.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
@@ -122,6 +122,7 @@ gf108_gr = { 
	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.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
@@ -96,6 +96,7 @@ gf110_gr = { 
	.init_419cc0 = gf100_gr_init_419cc0,

	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,