diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2015-06-14 13:33:54 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-07-28 17:22:39 +1000 |
| commit | bdab2e8673d18420ac270650e36cee27d0993d29 (patch) | |
| tree | 4a794681e1ed0714cc30df390a1e5b13a4f69113 /drm/nouveau/nvkm/engine/pm/gf100.c | |
| parent | 6a31ea034d488ad65fd056c72291710a3d21259c (diff) | |
| download | nouveau-bdab2e8673d18420ac270650e36cee27d0993d29.tar.gz | |
pm/gf100: allow to share GPC, HUB and PART domains
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/engine/pm/gf100.c')
| -rw-r--r-- | drm/nouveau/nvkm/engine/pm/gf100.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drm/nouveau/nvkm/engine/pm/gf100.c b/drm/nouveau/nvkm/engine/pm/gf100.c index edab97aa9..64db47e37 100644 --- a/drm/nouveau/nvkm/engine/pm/gf100.c +++ b/drm/nouveau/nvkm/engine/pm/gf100.c @@ -97,11 +97,12 @@ gf100_pm_fini(struct nvkm_object *object, bool suspend) return nvkm_pm_fini(&priv->base, suspend); } -static int +int gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { + struct gf100_pm_oclass *mclass = (void *)oclass; struct gf100_pm_priv *priv; u32 mask; int ret; @@ -113,7 +114,7 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, /* HUB */ ret = nvkm_perfdom_new(&priv->base, "hub", 0, 0x1b0000, 0, 0x200, - gf100_pm_hub); + mclass->doms_hub); if (ret) return ret; @@ -123,7 +124,7 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, mask &= ~nv_rd32(priv, 0x022584); ret = nvkm_perfdom_new(&priv->base, "gpc", mask, 0x180000, - 0x1000, 0x200, gf100_pm_gpc); + 0x1000, 0x200, mclass->doms_gpc); if (ret) return ret; @@ -133,7 +134,7 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, mask &= ~nv_rd32(priv, 0x0225c8); ret = nvkm_perfdom_new(&priv->base, "part", mask, 0x1a0000, - 0x1000, 0x200, gf100_pm_part); + 0x1000, 0x200, mclass->doms_part); if (ret) return ret; @@ -142,13 +143,16 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, return 0; } -struct nvkm_oclass -gf100_pm_oclass = { - .handle = NV_ENGINE(PM, 0xc0), - .ofuncs = &(struct nvkm_ofuncs) { +struct nvkm_oclass * +gf100_pm_oclass = &(struct gf100_pm_oclass) { + .base.handle = NV_ENGINE(PM, 0xc0), + .base.ofuncs = &(struct nvkm_ofuncs) { .ctor = gf100_pm_ctor, .dtor = _nvkm_pm_dtor, .init = _nvkm_pm_init, .fini = gf100_pm_fini, }, -}; + .doms_gpc = gf100_pm_gpc, + .doms_hub = gf100_pm_hub, + .doms_part = gf100_pm_part, +}.base; |