diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 15:31:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:18:04 +1000 |
| commit | 4d34686eb607037dafffb9d66d9e50b4648cfda4 (patch) | |
| tree | db36fb1a4024b810577a2cbfdb20377f70d0f8f8 /drivers/gpu/drm/nouveau/include | |
| parent | 87c33f4e9f962f7facab0077f45b2cb21f46d03a (diff) | |
drm/nouveau/pm: namespace + nvidia gpu names (no binary change)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver. This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).
Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h index c9ffe2c70746..93181bbf0f63 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h @@ -1,16 +1,13 @@ #ifndef __NVKM_PM_H__ #define __NVKM_PM_H__ - -#include <core/device.h> #include <core/engine.h> -#include <core/engctx.h> -struct nouveau_perfdom; -struct nouveau_perfctr; -struct nouveau_pm { - struct nouveau_engine base; +struct nvkm_perfdom; +struct nvkm_perfctr; +struct nvkm_pm { + struct nvkm_engine base; - struct nouveau_perfctx *context; + struct nvkm_perfctx *context; void *profile_data; struct list_head domains; @@ -21,18 +18,17 @@ struct nouveau_pm { u32 last; }; -static inline struct nouveau_pm * -nouveau_pm(void *obj) +static inline struct nvkm_pm * +nvkm_pm(void *obj) { - return (void *)nouveau_engine(obj, NVDEV_ENGINE_PM); + return (void *)nvkm_engine(obj, NVDEV_ENGINE_PM); } -extern struct nouveau_oclass *nv40_pm_oclass; -extern struct nouveau_oclass *nv50_pm_oclass; -extern struct nouveau_oclass *nv84_pm_oclass; -extern struct nouveau_oclass *nva3_pm_oclass; -extern struct nouveau_oclass nvc0_pm_oclass; -extern struct nouveau_oclass nve0_pm_oclass; -extern struct nouveau_oclass nvf0_pm_oclass; - +extern struct nvkm_oclass *nv40_pm_oclass; +extern struct nvkm_oclass *nv50_pm_oclass; +extern struct nvkm_oclass *g84_pm_oclass; +extern struct nvkm_oclass *gt215_pm_oclass; +extern struct nvkm_oclass gf100_pm_oclass; +extern struct nvkm_oclass gk104_pm_oclass; +extern struct nvkm_oclass gk110_pm_oclass; #endif |