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

drm/nouveau/gr/gf100-: move some init to init_rop_exceptions() 



Ampere.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent be99d041

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

+17 −7
Original line number Diff line number Diff line
@@ -2154,6 +2154,20 @@ gf100_gr_init_400054(struct gf100_gr *gr) 
	nvkm_wr32(gr->base.engine.subdev.device, 0x400054, 0x34ce3464);

}



void

gf100_gr_init_rop_exceptions(struct gf100_gr *gr)

{

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

	int rop;



	for (rop = 0; rop < gr->rop_nr; rop++) {

		nvkm_wr32(device, ROP_UNIT(rop, 0x144), 0x40000000);

		nvkm_wr32(device, ROP_UNIT(rop, 0x070), 0x40000000);

		nvkm_wr32(device, ROP_UNIT(rop, 0x204), 0xffffffff);

		nvkm_wr32(device, ROP_UNIT(rop, 0x208), 0xffffffff);

	}

}



void

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

{
@@ -2283,7 +2297,7 @@ int 
gf100_gr_init(struct gf100_gr *gr)

{

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

	int gpc, tpc, rop;

	int gpc, tpc;



	nvkm_mask(device, 0x400500, 0x00010001, 0x00000000);
@@ -2375,12 +2389,7 @@ gf100_gr_init(struct gf100_gr *gr) 
		nvkm_wr32(device, GPC_UNIT(gpc, 0x2c94), 0xffffffff);

	}



	for (rop = 0; rop < gr->rop_nr; rop++) {

		nvkm_wr32(device, ROP_UNIT(rop, 0x144), 0x40000000);

		nvkm_wr32(device, ROP_UNIT(rop, 0x070), 0x40000000);

		nvkm_wr32(device, ROP_UNIT(rop, 0x204), 0xffffffff);

		nvkm_wr32(device, ROP_UNIT(rop, 0x208), 0xffffffff);

	}

	gr->func->init_rop_exceptions(gr);



	nvkm_wr32(device, 0x400108, 0xffffffff);

	nvkm_wr32(device, 0x400138, 0xffffffff);
@@ -2464,6 +2473,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_rop_exceptions = gf100_gr_init_rop_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.mmio = gf100_gr_pack_mmio,

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

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,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_rop_exceptions)(struct gf100_gr *);

	void (*init_400054)(struct gf100_gr *);

	void (*init_4188a4)(struct gf100_gr *);

	void (*trap_mp)(struct gf100_gr *, int gpc, int tpc);
@@ -200,6 +201,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_rop_exceptions(struct gf100_gr *);

void gf100_gr_init_400054(struct gf100_gr *);

void gf100_gr_init_num_tpc_per_gpc(struct gf100_gr *, bool, bool);

extern const struct gf100_gr_func_zbc gf100_gr_zbc;

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

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,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_rop_exceptions = gf100_gr_init_rop_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.mmio = gf104_gr_pack_mmio,

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

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,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_rop_exceptions = gf100_gr_init_rop_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.mmio = gf108_gr_pack_mmio,

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

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,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_rop_exceptions = gf100_gr_init_rop_exceptions,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.mmio = gf110_gr_pack_mmio,