diff options
| author | Ben Skeggs | 2015-08-20 06:54:19 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2015-08-28 04:40:41 +0200 |
| commit | 5ffeb84b8eba71b4f88af6997db843ddf68149e0 (patch) | |
| tree | b4f6ab43516ef618da892ac8a3a70f948d554218 /drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | |
| parent | drm/nouveau/mpeg: convert user classes to new-style nvkm_object (diff) | |
| download | kernel-qcow2-linux-5ffeb84b8eba71b4f88af6997db843ddf68149e0.tar.gz kernel-qcow2-linux-5ffeb84b8eba71b4f88af6997db843ddf68149e0.tar.xz kernel-qcow2-linux-5ffeb84b8eba71b4f88af6997db843ddf68149e0.zip | |
drm/nouveau/pm: convert user classes to new-style nvkm_object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h index f13f8e6fc017..c67cea6aae4d 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h @@ -1,5 +1,6 @@ #ifndef __NVKM_PM_H__ #define __NVKM_PM_H__ +#define nvkm_pm(p) container_of((p), struct nvkm_pm, engine) #include <core/engine.h> struct nvkm_perfdom; @@ -7,20 +8,13 @@ struct nvkm_perfctr; struct nvkm_pm { struct nvkm_engine engine; - struct nvkm_perfctx *context; - void *profile_data; + struct nvkm_object *perfmon; struct list_head domains; struct list_head sources; u32 sequence; }; -static inline struct nvkm_pm * -nvkm_pm(void *obj) -{ - return (void *)nvkm_engine(obj, NVDEV_ENGINE_PM); -} - extern struct nvkm_oclass *nv40_pm_oclass; extern struct nvkm_oclass *nv50_pm_oclass; extern struct nvkm_oclass *g84_pm_oclass; |