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

drm/nouveau/gr/gf100-: virtualise init_swdx_pes_mask 



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

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

+2 −0
Original line number Diff line number Diff line
@@ -2001,6 +2001,8 @@ gf100_gr_init(struct gf100_gr *gr) 
		gr->func->init_rop_active_fbps(gr);

	if (gr->func->init_bios_2)

		gr->func->init_bios_2(gr);

	if (gr->func->init_swdx_pes_mask)

		gr->func->init_swdx_pes_mask(gr);



	nvkm_wr32(device, 0x400500, 0x00010001);

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

+3 −3
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ struct gf100_gr_func { 
	void (*init_num_active_ltcs)(struct gf100_gr *);

	void (*init_rop_active_fbps)(struct gf100_gr *);

	void (*init_bios_2)(struct gf100_gr *);

	void (*init_ppc_exceptions)(struct gf100_gr *);

	void (*init_swdx_pes_mask)(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 {
@@ -167,6 +167,8 @@ 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 gp102_gr_init_swdx_pes_mask(struct gf100_gr *);



#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)

#include <core/object.h>
@@ -317,6 +319,4 @@ extern const struct gf100_gr_init gm107_gr_init_cbm_0[]; 
void gm107_gr_init_bios(struct gf100_gr *);



void gm200_gr_init_gpc_mmu(struct gf100_gr *);



void gp102_gr_init_swdx_pes_mask(struct gf100_gr *);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ gp102_gr = { 
	.init_zcull = gf117_gr_init_zcull,

	.init_num_active_ltcs = gm200_gr_init_num_active_ltcs,

	.init_rop_active_fbps = gp100_gr_init_rop_active_fbps,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.init_swdx_pes_mask = gp102_gr_init_swdx_pes_mask,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.rops = gm200_gr_rops,

	.ppc_nr = 3,

	.grctx = &gp102_grctx,

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

+1 −1
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ gp107_gr = { 
	.init_zcull = gf117_gr_init_zcull,

	.init_num_active_ltcs = gm200_gr_init_num_active_ltcs,

	.init_rop_active_fbps = gp100_gr_init_rop_active_fbps,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.init_swdx_pes_mask = gp102_gr_init_swdx_pes_mask,

	.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,

	.rops = gm200_gr_rops,

	.ppc_nr = 1,

	.grctx = &gp107_grctx,