diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 05:48:16 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 03:17:52 +0100 |
| commit | a8c4362bad2218484870678f5d0c221968883f13 (patch) | |
| tree | dee2c1325ba0d3fe5bdb3dc05808a21e90e961b0 /drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | |
| parent | drm/nouveau/clk: namespace + nvidia gpu names (no binary change) (diff) | |
| download | linux-a8c4362bad2218484870678f5d0c221968883f13.tar.xz linux-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/nvkm/subdev/devinit/nv50.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h index f412bb7f780e..b882b65ff3cd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h @@ -1,23 +1,21 @@ #ifndef __NVKM_DEVINIT_NV50_H__ #define __NVKM_DEVINIT_NV50_H__ - #include "priv.h" struct nv50_devinit_priv { - struct nouveau_devinit base; + struct nvkm_devinit base; u32 r001540; }; -int nv50_devinit_ctor(struct nouveau_object *, struct nouveau_object *, - struct nouveau_oclass *, void *, u32, - struct nouveau_object **); -int nv50_devinit_init(struct nouveau_object *); -int nv50_devinit_pll_set(struct nouveau_devinit *, u32, u32); - -int nva3_devinit_pll_set(struct nouveau_devinit *, u32, u32); +int nv50_devinit_ctor(struct nvkm_object *, struct nvkm_object *, + struct nvkm_oclass *, void *, u32, + struct nvkm_object **); +int nv50_devinit_init(struct nvkm_object *); +int nv50_devinit_pll_set(struct nvkm_devinit *, u32, u32); -int nvc0_devinit_pll_set(struct nouveau_devinit *, u32, u32); +int gt215_devinit_pll_set(struct nvkm_devinit *, u32, u32); -u64 gm107_devinit_disable(struct nouveau_devinit *); +int gf100_devinit_pll_set(struct nvkm_devinit *, u32, u32); +u64 gm107_devinit_disable(struct nvkm_devinit *); #endif |