Commit 1a344688 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Ampere.

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

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

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

}



void

gf100_gr_init_exception2(struct gf100_gr *gr)

{

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



	nvkm_wr32(device, 0x40011c, 0xffffffff);

	nvkm_wr32(device, 0x400134, 0xffffffff);

}



void

gf100_gr_init_rop_exceptions(struct gf100_gr *gr)

{
@@ -2395,8 +2404,8 @@ gf100_gr_init(struct gf100_gr *gr) 
	nvkm_wr32(device, 0x400138, 0xffffffff);

	nvkm_wr32(device, 0x400118, 0xffffffff);

	nvkm_wr32(device, 0x400130, 0xffffffff);

	nvkm_wr32(device, 0x40011c, 0xffffffff);

	nvkm_wr32(device, 0x400134, 0xffffffff);

	if (gr->func->init_exception2)

		gr->func->init_exception2(gr);



	if (gr->func->init_400054)

		gr->func->init_400054(gr);
@@ -2474,6 +2483,7 @@ gf100_gr = { 
	.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_exception2 = gf100_gr_init_exception2,

	.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
@@ -166,6 +166,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_rop_exceptions)(struct gf100_gr *);

	void (*init_exception2)(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);
@@ -202,6 +203,7 @@ 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_exception2(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
@@ -128,6 +128,7 @@ gf104_gr = { 
	.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_exception2 = gf100_gr_init_exception2,

	.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
@@ -126,6 +126,7 @@ gf108_gr = { 
	.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_exception2 = gf100_gr_init_exception2,

	.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
@@ -100,6 +100,7 @@ gf110_gr = { 
	.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_exception2 = gf100_gr_init_exception2,

	.init_400054 = gf100_gr_init_400054,

	.trap_mp = gf100_gr_trap_mp,

	.mmio = gf110_gr_pack_mmio,