leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/pm: stack perfdom class under perfmon

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2015-06-14 12:20:37 +10:00
parent 2d4b94b95f
commit f21950ea35
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
View File

@@ -576,12 +576,32 @@ nvkm_perfmon_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
return -EINVAL; return -EINVAL;
} }
static struct nvkm_oclass
nvkm_perfmon_sclass[] = {
{ .handle = NVIF_IOCTL_NEW_V0_PERFDOM,
.ofuncs = &nvkm_perfdom_ofuncs,
},
{}
};
static int
nvkm_perfmon_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
struct nvkm_parent *perfmon;
int ret = nvkm_parent_create(parent, engine, oclass, 0,
nvkm_perfmon_sclass, 0, &perfmon);
*pobject = perfmon ? &perfmon->object : NULL;
return ret;
}
static struct nvkm_ofuncs static struct nvkm_ofuncs
nvkm_perfmon_ofuncs = { nvkm_perfmon_ofuncs = {
.ctor = _nvkm_object_ctor, .ctor = nvkm_perfmon_ctor,
.dtor = nvkm_object_destroy, .dtor = _nvkm_parent_dtor,
.init = nvkm_object_init, .init = _nvkm_parent_init,
.fini = nvkm_object_fini, .fini = _nvkm_parent_fini,
.mthd = nvkm_perfmon_mthd, .mthd = nvkm_perfmon_mthd,
}; };
@@ -591,9 +611,6 @@ nvkm_pm_sclass[] = {
.handle = NVIF_IOCTL_NEW_V0_PERFMON, .handle = NVIF_IOCTL_NEW_V0_PERFMON,
.ofuncs = &nvkm_perfmon_ofuncs, .ofuncs = &nvkm_perfmon_ofuncs,
}, },
{ .handle = NVIF_IOCTL_NEW_V0_PERFDOM,
.ofuncs = &nvkm_perfdom_ofuncs,
},
{}, {},
}; };
@@ -622,6 +639,13 @@ nvkm_perfctx_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_perfctx *ctx; struct nvkm_perfctx *ctx;
int ret; int ret;
/* no context needed for perfdom objects... */
if (nv_mclass(parent) != NV_DEVICE) {
atomic_inc(&parent->refcount);
*pobject = parent;
return 1;
}
ret = nvkm_engctx_create(parent, engine, oclass, NULL, 0, 0, 0, &ctx); ret = nvkm_engctx_create(parent, engine, oclass, NULL, 0, 0, 0, &ctx);
*pobject = nv_object(ctx); *pobject = nv_object(ctx);
if (ret) if (ret)