diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-04-19 11:10:38 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-05-20 14:43:04 +1000 |
| commit | 87ac331e3f9aca9bdc3697bb936b3b2b43cbf5a0 (patch) | |
| tree | c0c099ee68c276c698a77010472f39fd72eee11b /drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c | |
| parent | 4d3df19a8e6c9e60eed7f3c6e2025362b3ca2da5 (diff) | |
| download | linux-87ac331e3f9aca9bdc3697bb936b3b2b43cbf5a0.tar.bz2 | |
drm/nouveau/gr/gk104-: move rop_active_fbps init to nonctx
Matches newer RM.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c index 487bd65b167d..56b9669f076a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c @@ -358,6 +358,8 @@ gm107_gr_init(struct gf100_gr *gr) nvkm_wr32(device, GPC_BCAST(0x3fd4), magicgpc918); nvkm_wr32(device, GPC_BCAST(0x08ac), nvkm_rd32(device, 0x100800)); + gr->func->init_rop_active_fbps(gr); + nvkm_wr32(device, 0x400500, 0x00010001); nvkm_wr32(device, 0x400100, 0xffffffff); @@ -440,6 +442,7 @@ gm107_gr_gpccs_ucode = { static const struct gf100_gr_func gm107_gr = { .init = gm107_gr_init, + .init_rop_active_fbps = gk104_gr_init_rop_active_fbps, .mmio = gm107_gr_pack_mmio, .fecs.ucode = &gm107_gr_fecs_ucode, .gpccs.ucode = &gm107_gr_gpccs_ucode, |