aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-03-20 15:38:23 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-04-14 17:00:51 +1000
commited22e684622533f903dfad9beb99d872536c3040 (patch)
tree1f5890453126ae4639b6f72c390867ab7ed884ba /drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
parentdrm/nouveau/pmu/gk208: implement gr power-up magic with gk110_pmu_pgob() (diff)
downloadlinux-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/gk208.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
index 31d8e6055376..22d67fd8c323 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
@@ -176,7 +176,7 @@ struct nvkm_oclass *
gk208_gr_oclass = &(struct gf100_gr_oclass) {
.base.handle = NV_ENGINE(GR, 0x08),
.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,