diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:31 +1000 |
| commit | a1e88736221d2e971726931c449ed7d0af31755b (patch) | |
| tree | 64d2d987780d3ef023be7216d7b1813e4aa57b54 /drivers/gpu/drm/nouveau/nvkm/engine/pm | |
| parent | a1bfb29a33521efa6b1714589bf68cb4afebacb1 (diff) | |
drm/nouveau/device: decouple from engine machinery
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/pm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index ba1623de8bcb..b75395bf8ffa 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -639,7 +639,7 @@ nvkm_perfctx_dtor(struct nvkm_object *object) struct nvkm_perfctx *ctx = (void *)object; mutex_lock(&nv_subdev(pm)->mutex); - nvkm_engctx_destroy(&ctx->base); + nvkm_gpuobj_destroy(&ctx->base); if (pm->context == ctx) pm->context = NULL; mutex_unlock(&nv_subdev(pm)->mutex); @@ -661,7 +661,7 @@ nvkm_perfctx_ctor(struct nvkm_object *parent, struct nvkm_object *engine, return 1; } - ret = nvkm_engctx_create(parent, engine, oclass, NULL, 0, 0, 0, &ctx); + ret = nvkm_gpuobj_create(parent, engine, oclass, 0, NULL, 0, 0, 0, &ctx); *pobject = nv_object(ctx); if (ret) return ret; @@ -678,12 +678,11 @@ nvkm_perfctx_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass nvkm_pm_cclass = { - .handle = NV_ENGCTX(PM, 0x00), .ofuncs = &(struct nvkm_ofuncs) { .ctor = nvkm_perfctx_ctor, .dtor = nvkm_perfctx_dtor, - .init = _nvkm_engctx_init, - .fini = _nvkm_engctx_fini, + .init = _nvkm_gpuobj_init, + .fini = _nvkm_gpuobj_fini, }, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h index 69b72780b34b..2af3a5013096 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h @@ -14,10 +14,10 @@ struct nvkm_perfctr { extern struct nvkm_oclass nvkm_pm_sclass[]; -#include <core/engctx.h> +#include <core/gpuobj.h> struct nvkm_perfctx { - struct nvkm_engctx base; + struct nvkm_gpuobj base; }; extern struct nvkm_oclass nvkm_pm_cclass; |