Commit 8b058ca5 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/gr/gf100-: virtualise r405a14

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6f63a5fb
...@@ -1946,6 +1946,9 @@ gf100_gr_init(struct gf100_gr *gr) ...@@ -1946,6 +1946,9 @@ gf100_gr_init(struct gf100_gr *gr)
else else
gf100_gr_mmio(gr, gr->func->mmio); gf100_gr_mmio(gr, gr->func->mmio);
if (gr->func->init_r405a14)
gr->func->init_r405a14(gr);
nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001); nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);
memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr)); memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
......
...@@ -122,6 +122,7 @@ struct gf100_gr_func { ...@@ -122,6 +122,7 @@ struct gf100_gr_func {
void (*dtor)(struct gf100_gr *); void (*dtor)(struct gf100_gr *);
int (*init)(struct gf100_gr *); int (*init)(struct gf100_gr *);
void (*init_gpc_mmu)(struct gf100_gr *); void (*init_gpc_mmu)(struct gf100_gr *);
void (*init_r405a14)(struct gf100_gr *);
void (*init_rop_active_fbps)(struct gf100_gr *); void (*init_rop_active_fbps)(struct gf100_gr *);
void (*init_ppc_exceptions)(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 *);
......
...@@ -103,10 +103,17 @@ gf108_gr_pack_mmio[] = { ...@@ -103,10 +103,17 @@ gf108_gr_pack_mmio[] = {
* PGRAPH engine/subdev functions * PGRAPH engine/subdev functions
******************************************************************************/ ******************************************************************************/
static void
gf108_gr_init_r405a14(struct gf100_gr *gr)
{
nvkm_wr32(gr->base.engine.subdev.device, 0x405a14, 0x80000000);
}
static const struct gf100_gr_func static const struct gf100_gr_func
gf108_gr = { gf108_gr = {
.init = gf100_gr_init, .init = gf100_gr_init,
.init_gpc_mmu = gf100_gr_init_gpc_mmu, .init_gpc_mmu = gf100_gr_init_gpc_mmu,
.init_r405a14 = gf108_gr_init_r405a14,
.mmio = gf108_gr_pack_mmio, .mmio = gf108_gr_pack_mmio,
.fecs.ucode = &gf100_gr_fecs_ucode, .fecs.ucode = &gf100_gr_fecs_ucode,
.gpccs.ucode = &gf100_gr_gpccs_ucode, .gpccs.ucode = &gf100_gr_gpccs_ucode,
......
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