Commit 5c05a589 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gf100-: virtualise trap_mp 



Required to support Volta.

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

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

+3 −2
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static const struct nvkm_bitfield gf100_mp_global_error[] = { 
	{}

};



static void

void

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

{

	struct nvkm_subdev *subdev = &gr->base.engine.subdev;
@@ -1046,7 +1046,7 @@ gf100_gr_trap_tpc(struct gf100_gr *gr, int gpc, int tpc) 
	}



	if (stat & 0x00000002) {

		gf100_gr_trap_mp(gr, gpc, tpc);

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

		stat &= ~0x00000002;

	}
@@ -2176,6 +2176,7 @@ gf100_gr = { 
	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.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
@@ -145,6 +145,7 @@ struct gf100_gr_func { 
	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 (*trap_mp)(struct gf100_gr *, int gpc, int tpc);

	void (*set_hww_esr_report_mask)(struct gf100_gr *);

	const struct gf100_gr_pack *mmio;

	struct {
@@ -301,6 +302,7 @@ extern const struct gf100_gr_init gf100_gr_init_be_0[]; 
extern const struct gf100_gr_init gf100_gr_init_fe_1[];

extern const struct gf100_gr_init gf100_gr_init_pe_1[];

void gf100_gr_init_gpc_mmu(struct gf100_gr *);

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



extern const struct gf100_gr_init gf104_gr_init_ds_0[];

extern const struct gf100_gr_init gf104_gr_init_tex_0[];

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

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ gf104_gr = { 
	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.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
@@ -124,6 +124,7 @@ gf108_gr = { 
	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.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
@@ -98,6 +98,7 @@ gf110_gr = { 
	.init_tex_hww_esr = gf100_gr_init_tex_hww_esr,

	.init_shader_exceptions = gf100_gr_init_shader_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.mmio = gf110_gr_pack_mmio,

	.fecs.ucode = &gf100_gr_fecs_ucode,

	.gpccs.ucode = &gf100_gr_gpccs_ucode,