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

drm/nouveau/gr/gf100-: virtualise init_400054 



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

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

+9 −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_400054(struct gf100_gr *gr)

{

	nvkm_wr32(gr->base.engine.subdev.device, 0x400054, 0x34ce3464);

}



void

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

{
@@ -2122,7 +2128,8 @@ gf100_gr_init(struct gf100_gr *gr) 
	nvkm_wr32(device, 0x40011c, 0xffffffff);

	nvkm_wr32(device, 0x400134, 0xffffffff);



	nvkm_wr32(device, 0x400054, 0x34ce3464);

	if (gr->func->init_400054)

		gr->func->init_400054(gr);



	gf100_gr_zbc_init(gr);
@@ -2162,6 +2169,7 @@ gf100_gr = { 
	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.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

+3 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ struct gf100_gr_func { 
	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 (*init_400054)(struct gf100_gr *);

	void (*set_hww_esr_report_mask)(struct gf100_gr *);

	const struct gf100_gr_pack *mmio;

	struct {
@@ -167,6 +168,7 @@ 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 gf100_gr_init_400054(struct gf100_gr *);



void gf117_gr_init_zcull(struct gf100_gr *);
@@ -180,6 +182,7 @@ 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);

void gm107_gr_init_400054(struct gf100_gr *);



int gk20a_gr_init(struct gf100_gr *);

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

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ gf104_gr = { 
	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.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
@@ -123,6 +123,7 @@ gf108_gr = { 
	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.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
@@ -97,6 +97,7 @@ gf110_gr = { 
	.init_419eb4 = gf100_gr_init_419eb4,

	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,