Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/nouveau/gr/gk104-: share implementation of ppc exception init 



This was really inconsistent, some implementations could touch PPCs
that didn't exist, others neglected to touch ones that did.

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

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

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ struct gf100_gr_func { 
	int (*init)(struct gf100_gr *);

	void (*init_gpc_mmu)(struct gf100_gr *);

	void (*init_rop_active_fbps)(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;

	struct {
@@ -139,6 +140,7 @@ int gf100_gr_rops(struct gf100_gr *); 


int gk104_gr_init(struct gf100_gr *);

void gk104_gr_init_rop_active_fbps(struct gf100_gr *);

void gk104_gr_init_ppc_exceptions(struct gf100_gr *);



int gk20a_gr_init(struct gf100_gr *);

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

+18 −1
Original line number Diff line number Diff line
@@ -188,6 +188,21 @@ gk104_gr_init_rop_active_fbps(struct gf100_gr *gr) 
	nvkm_mask(device, 0x408958, 0x0000000f, fbp_count); /* crop */

}



void

gk104_gr_init_ppc_exceptions(struct gf100_gr *gr)

{

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

	int gpc, ppc;



	for (gpc = 0; gpc < gr->gpc_nr; gpc++) {

		for (ppc = 0; ppc < gr->ppc_nr[gpc]; ppc++) {

			if (!(gr->ppc_mask[gpc] & (1 << ppc)))

				continue;

			nvkm_wr32(device, PPC_UNIT(gpc, ppc, 0x038), 0xc0000000);

		}

	}

}



int

gk104_gr_init(struct gf100_gr *gr)

{
@@ -260,8 +275,9 @@ gk104_gr_init(struct gf100_gr *gr) 
	nvkm_mask(device, 0x419cc0, 0x00000008, 0x00000008);

	nvkm_mask(device, 0x419eb4, 0x00001000, 0x00001000);



	gr->func->init_ppc_exceptions(gr);



	for (gpc = 0; gpc < gr->gpc_nr; gpc++) {

		nvkm_wr32(device, GPC_UNIT(gpc, 0x3038), 0xc0000000);

		nvkm_wr32(device, GPC_UNIT(gpc, 0x0420), 0xc0000000);

		nvkm_wr32(device, GPC_UNIT(gpc, 0x0900), 0xc0000000);

		nvkm_wr32(device, GPC_UNIT(gpc, 0x1028), 0xc0000000);
@@ -324,6 +340,7 @@ static const struct gf100_gr_func 
gk104_gr = {

	.init = gk104_gr_init,

	.init_rop_active_fbps = gk104_gr_init_rop_active_fbps,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.mmio = gk104_gr_pack_mmio,

	.fecs.ucode = &gk104_gr_fecs_ucode,

	.gpccs.ucode = &gk104_gr_gpccs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ static const struct gf100_gr_func 
gk110_gr = {

	.init = gk104_gr_init,

	.init_rop_active_fbps = gk104_gr_init_rop_active_fbps,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.mmio = gk110_gr_pack_mmio,

	.fecs.ucode = &gk110_gr_fecs_ucode,

	.gpccs.ucode = &gk110_gr_gpccs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static const struct gf100_gr_func 
gk110b_gr = {

	.init = gk104_gr_init,

	.init_rop_active_fbps = gk104_gr_init_rop_active_fbps,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.mmio = gk110b_gr_pack_mmio,

	.fecs.ucode = &gk110_gr_fecs_ucode,

	.gpccs.ucode = &gk110_gr_gpccs_ucode,

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

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static const struct gf100_gr_func 
gk208_gr = {

	.init = gk104_gr_init,

	.init_rop_active_fbps = gk104_gr_init_rop_active_fbps,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.mmio = gk208_gr_pack_mmio,

	.fecs.ucode = &gk208_gr_fecs_ucode,

	.gpccs.ucode = &gk208_gr_gpccs_ucode,