Commit dff30dbd authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/gr/gf100-: virtualise init_swdx_pes_mask

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0f78acc8
...@@ -2001,6 +2001,8 @@ gf100_gr_init(struct gf100_gr *gr) ...@@ -2001,6 +2001,8 @@ gf100_gr_init(struct gf100_gr *gr)
gr->func->init_rop_active_fbps(gr); gr->func->init_rop_active_fbps(gr);
if (gr->func->init_bios_2) if (gr->func->init_bios_2)
gr->func->init_bios_2(gr); 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); nvkm_wr32(device, 0x400500, 0x00010001);
......
...@@ -129,8 +129,8 @@ struct gf100_gr_func { ...@@ -129,8 +129,8 @@ struct gf100_gr_func {
void (*init_num_active_ltcs)(struct gf100_gr *); void (*init_num_active_ltcs)(struct gf100_gr *);
void (*init_rop_active_fbps)(struct gf100_gr *); void (*init_rop_active_fbps)(struct gf100_gr *);
void (*init_bios_2)(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_swdx_pes_mask)(struct gf100_gr *);
void (*init_ppc_exceptions)(struct gf100_gr *);
void (*set_hww_esr_report_mask)(struct gf100_gr *); void (*set_hww_esr_report_mask)(struct gf100_gr *);
const struct gf100_gr_pack *mmio; const struct gf100_gr_pack *mmio;
struct { struct {
...@@ -167,6 +167,8 @@ void gm200_gr_init_num_active_ltcs(struct gf100_gr *); ...@@ -167,6 +167,8 @@ void gm200_gr_init_num_active_ltcs(struct gf100_gr *);
int gp100_gr_init(struct gf100_gr *); int gp100_gr_init(struct gf100_gr *);
void gp100_gr_init_rop_active_fbps(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) #define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)
#include <core/object.h> #include <core/object.h>
...@@ -317,6 +319,4 @@ extern const struct gf100_gr_init gm107_gr_init_cbm_0[]; ...@@ -317,6 +319,4 @@ extern const struct gf100_gr_init gm107_gr_init_cbm_0[];
void gm107_gr_init_bios(struct gf100_gr *); void gm107_gr_init_bios(struct gf100_gr *);
void gm200_gr_init_gpc_mmu(struct gf100_gr *); void gm200_gr_init_gpc_mmu(struct gf100_gr *);
void gp102_gr_init_swdx_pes_mask(struct gf100_gr *);
#endif #endif
...@@ -48,8 +48,8 @@ gp102_gr = { ...@@ -48,8 +48,8 @@ gp102_gr = {
.init_zcull = gf117_gr_init_zcull, .init_zcull = gf117_gr_init_zcull,
.init_num_active_ltcs = gm200_gr_init_num_active_ltcs, .init_num_active_ltcs = gm200_gr_init_num_active_ltcs,
.init_rop_active_fbps = gp100_gr_init_rop_active_fbps, .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_swdx_pes_mask = gp102_gr_init_swdx_pes_mask,
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
.rops = gm200_gr_rops, .rops = gm200_gr_rops,
.ppc_nr = 3, .ppc_nr = 3,
.grctx = &gp102_grctx, .grctx = &gp102_grctx,
......
...@@ -34,8 +34,8 @@ gp107_gr = { ...@@ -34,8 +34,8 @@ gp107_gr = {
.init_zcull = gf117_gr_init_zcull, .init_zcull = gf117_gr_init_zcull,
.init_num_active_ltcs = gm200_gr_init_num_active_ltcs, .init_num_active_ltcs = gm200_gr_init_num_active_ltcs,
.init_rop_active_fbps = gp100_gr_init_rop_active_fbps, .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_swdx_pes_mask = gp102_gr_init_swdx_pes_mask,
.init_ppc_exceptions = gk104_gr_init_ppc_exceptions,
.rops = gm200_gr_rops, .rops = gm200_gr_rops,
.ppc_nr = 1, .ppc_nr = 1,
.grctx = &gp107_grctx, .grctx = &gp107_grctx,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment