Commit 2585a1b1 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



The value for GF100 has changed here, but it matches RM now.

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

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_fecs_exceptions(struct gf100_gr *gr)

{

	const u32 data = gr->firmware ? 0x000e0000 : 0x000e0001;

	nvkm_wr32(gr->base.engine.subdev.device, 0x409c24, data);

}



void

gf100_gr_init_gpc_mmu(struct gf100_gr *gr)

{
@@ -2010,7 +2017,8 @@ gf100_gr_init(struct gf100_gr *gr) 
	nvkm_wr32(device, 0x40013c, 0xffffffff);

	nvkm_wr32(device, 0x400124, 0x00000002);



	nvkm_wr32(device, 0x409c24, 0x000f0000);

	gr->func->init_fecs_exceptions(gr);



	nvkm_wr32(device, 0x404000, 0xc0000000);

	nvkm_wr32(device, 0x404600, 0xc0000000);

	nvkm_wr32(device, 0x408030, 0xc0000000);
@@ -2088,6 +2096,7 @@ gf100_gr = { 
	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_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

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ struct gf100_gr_func { 
	void (*init_rop_active_fbps)(struct gf100_gr *);

	void (*init_bios_2)(struct gf100_gr *);

	void (*init_swdx_pes_mask)(struct gf100_gr *);

	void (*init_fecs_exceptions)(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;
@@ -151,6 +152,7 @@ int gf100_gr_init(struct gf100_gr *); 
void gf100_gr_init_vsc_stream_master(struct gf100_gr *);

void gf100_gr_init_zcull(struct gf100_gr *);

void gf100_gr_init_num_active_ltcs(struct gf100_gr *);

void gf100_gr_init_fecs_exceptions(struct gf100_gr *);



void gf117_gr_init_zcull(struct gf100_gr *);
@@ -166,6 +168,7 @@ void gm200_gr_init_num_active_ltcs(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 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
@@ -119,6 +119,7 @@ gf104_gr = { 
	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_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
@@ -117,6 +117,7 @@ gf108_gr = { 
	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_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
@@ -91,6 +91,7 @@ gf110_gr = { 
	.init_vsc_stream_master = gf100_gr_init_vsc_stream_master,

	.init_zcull = gf100_gr_init_zcull,

	.init_num_active_ltcs = gf100_gr_init_num_active_ltcs,

	.init_fecs_exceptions = gf100_gr_init_fecs_exceptions,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,