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

drm/nouveau/gr/gf100-: virtualise init_sked_hww_esr 



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

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

+4 −0
Original line number Diff line number Diff line
@@ -2036,6 +2036,10 @@ gf100_gr_init(struct gf100_gr *gr) 


	nvkm_wr32(device, 0x404490, 0xc0000000);

	nvkm_wr32(device, 0x406018, 0xc0000000);



	if (gr->func->init_sked_hww_esr)

		gr->func->init_sked_hww_esr(gr);



	nvkm_wr32(device, 0x405840, 0xc0000000);

	nvkm_wr32(device, 0x405844, 0x00ffffff);

	nvkm_mask(device, 0x419cc0, 0x00000008, 0x00000008);

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

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

	void (*init_ds_hww_esr_2)(struct gf100_gr *);

	void (*init_40601c)(struct gf100_gr *);

	void (*init_sked_hww_esr)(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;
@@ -163,6 +164,7 @@ int gk104_gr_init(struct gf100_gr *); 
void gk104_gr_init_vsc_stream_master(struct gf100_gr *);

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 *);



int gk20a_gr_init(struct gf100_gr *);

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

+8 −1
Original line number Diff line number Diff line
@@ -380,6 +380,12 @@ gk104_clkgate_pack[] = { 
 * PGRAPH engine/subdev functions

 ******************************************************************************/



void

gk104_gr_init_sked_hww_esr(struct gf100_gr *gr)

{

	nvkm_wr32(gr->base.engine.subdev.device, 0x407020, 0x40000000);

}



static void

gk104_gr_init_fecs_exceptions(struct gf100_gr *gr)

{
@@ -451,7 +457,7 @@ gk104_gr_init(struct gf100_gr *gr) 
	nvkm_wr32(device, 0x408030, 0xc0000000);

	nvkm_wr32(device, 0x404490, 0xc0000000);

	nvkm_wr32(device, 0x406018, 0xc0000000);

	nvkm_wr32(device, 0x407020, 0x40000000);

	gr->func->init_sked_hww_esr(gr);

	nvkm_wr32(device, 0x405840, 0xc0000000);

	nvkm_wr32(device, 0x405844, 0x00ffffff);

	nvkm_mask(device, 0x419cc0, 0x00000008, 0x00000008);
@@ -527,6 +533,7 @@ gk104_gr = { 
	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_rop_active_fbps = gk104_gr_init_rop_active_fbps,

	.init_fecs_exceptions = gk104_gr_init_fecs_exceptions,

	.init_sked_hww_esr = gk104_gr_init_sked_hww_esr,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.mmio = gk104_gr_pack_mmio,

	.fecs.ucode = &gk104_gr_fecs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ gk110_gr = { 
	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_rop_active_fbps = gk104_gr_init_rop_active_fbps,

	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_sked_hww_esr = gk104_gr_init_sked_hww_esr,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.mmio = gk110_gr_pack_mmio,

	.fecs.ucode = &gk110_gr_fecs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ gk110b_gr = { 
	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_rop_active_fbps = gk104_gr_init_rop_active_fbps,

	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.init_sked_hww_esr = gk104_gr_init_sked_hww_esr,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.mmio = gk110b_gr_pack_mmio,

	.fecs.ucode = &gk110_gr_fecs_ucode,