diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 14:48:16 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:52 +1000 |
| commit | a8c4362bad2218484870678f5d0c221968883f13 (patch) | |
| tree | dee2c1325ba0d3fe5bdb3dc05808a21e90e961b0 /drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h | |
| parent | drm/nouveau/clk: namespace + nvidia gpu names (no binary change) (diff) | |
| download | linux-dev-a8c4362bad2218484870678f5d0c221968883f13.tar.xz linux-dev-a8c4362bad2218484870678f5d0c221968883f13.zip | |
drm/nouveau/devinit: 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/nvkm/subdev/devinit.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h index b627d5329543..d1bbe0d62b35 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h @@ -1,35 +1,32 @@ -#ifndef __NOUVEAU_DEVINIT_H__ -#define __NOUVEAU_DEVINIT_H__ - +#ifndef __NVKM_DEVINIT_H__ +#define __NVKM_DEVINIT_H__ #include <core/subdev.h> -#include <core/device.h> -struct nouveau_devinit { - struct nouveau_subdev base; +struct nvkm_devinit { + struct nvkm_subdev base; bool post; - void (*meminit)(struct nouveau_devinit *); - int (*pll_set)(struct nouveau_devinit *, u32 type, u32 freq); - u32 (*mmio)(struct nouveau_devinit *, u32 addr); + void (*meminit)(struct nvkm_devinit *); + int (*pll_set)(struct nvkm_devinit *, u32 type, u32 freq); + u32 (*mmio)(struct nvkm_devinit *, u32 addr); }; -static inline struct nouveau_devinit * -nouveau_devinit(void *obj) +static inline struct nvkm_devinit * +nvkm_devinit(void *obj) { - return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_DEVINIT); + return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_DEVINIT); } -extern struct nouveau_oclass *nv04_devinit_oclass; -extern struct nouveau_oclass *nv05_devinit_oclass; -extern struct nouveau_oclass *nv10_devinit_oclass; -extern struct nouveau_oclass *nv1a_devinit_oclass; -extern struct nouveau_oclass *nv20_devinit_oclass; -extern struct nouveau_oclass *nv50_devinit_oclass; -extern struct nouveau_oclass *nv84_devinit_oclass; -extern struct nouveau_oclass *nv98_devinit_oclass; -extern struct nouveau_oclass *nva3_devinit_oclass; -extern struct nouveau_oclass *nvaf_devinit_oclass; -extern struct nouveau_oclass *nvc0_devinit_oclass; -extern struct nouveau_oclass *gm107_devinit_oclass; -extern struct nouveau_oclass *gm204_devinit_oclass; - +extern struct nvkm_oclass *nv04_devinit_oclass; +extern struct nvkm_oclass *nv05_devinit_oclass; +extern struct nvkm_oclass *nv10_devinit_oclass; +extern struct nvkm_oclass *nv1a_devinit_oclass; +extern struct nvkm_oclass *nv20_devinit_oclass; +extern struct nvkm_oclass *nv50_devinit_oclass; +extern struct nvkm_oclass *g84_devinit_oclass; +extern struct nvkm_oclass *g98_devinit_oclass; +extern struct nvkm_oclass *gt215_devinit_oclass; +extern struct nvkm_oclass *mcp89_devinit_oclass; +extern struct nvkm_oclass *gf100_devinit_oclass; +extern struct nvkm_oclass *gm107_devinit_oclass; +extern struct nvkm_oclass *gm204_devinit_oclass; #endif |