diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-03-20 15:38:23 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-04-14 17:00:51 +1000 |
| commit | ed22e684622533f903dfad9beb99d872536c3040 (patch) | |
| tree | 1f5890453126ae4639b6f72c390867ab7ed884ba /drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | |
| parent | drm/nouveau/pmu/gk208: implement gr power-up magic with gk110_pmu_pgob() (diff) | |
| download | linux-dev-ed22e684622533f903dfad9beb99d872536c3040.tar.xz linux-dev-ed22e684622533f903dfad9beb99d872536c3040.zip | |
drm/nouveau/gr/gk104-gk20a: call pmu to disable any power-gating before ctor()
On some of these chipsets, reading NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK
can trigger a PRI fault and return an error code instead of a TPC mask,
unless PGOB has been disabled first.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c index 29569ac6b47b..291b60a9262e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c @@ -197,7 +197,7 @@ struct nvkm_oclass * gk110_gr_oclass = &(struct gf100_gr_oclass) { .base.handle = NV_ENGINE(GR, 0xf0), .base.ofuncs = &(struct nvkm_ofuncs) { - .ctor = gf100_gr_ctor, + .ctor = gk104_gr_ctor, .dtor = gf100_gr_dtor, .init = gk104_gr_init, .fini = _nvkm_gr_fini, |