diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 14:47:24 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 15:42:00 +1000 |
commit | 8700f8d9963c53718cdd567762b8f1d588c8b8e5 (patch) | |
tree | 542e62402ac574eb9f210d8db38ab916a0820928 /drm/nouveau/nvkm/subdev/clk/nv50.h | |
parent | 318a53d130bd52ea81c5dc5dc1ec4b25d90e3b95 (diff) | |
download | nouveau-8700f8d9963c53718cdd567762b8f1d588c8b8e5.tar.gz |
clk: 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 'drm/nouveau/nvkm/subdev/clk/nv50.h')
-rw-r--r-- | drm/nouveau/nvkm/subdev/clk/nv50.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drm/nouveau/nvkm/subdev/clk/nv50.h b/drm/nouveau/nvkm/subdev/clk/nv50.h index ae6421fd2..0ead76a32 100644 --- a/drm/nouveau/nvkm/subdev/clk/nv50.h +++ b/drm/nouveau/nvkm/subdev/clk/nv50.h @@ -1,7 +1,5 @@ #ifndef __NVKM_CLK_NV50_H__ #define __NVKM_CLK_NV50_H__ - -#include <subdev/bus.h> #include <subdev/bus/hwsq.h> #include <subdev/clk.h> @@ -15,17 +13,16 @@ struct nv50_clk_hwsq { }; struct nv50_clk_priv { - struct nouveau_clk base; + struct nvkm_clk base; struct nv50_clk_hwsq hwsq; }; -int nv50_clk_ctor(struct nouveau_object *, struct nouveau_object *, - struct nouveau_oclass *, void *, u32, - struct nouveau_object **); +int nv50_clk_ctor(struct nvkm_object *, struct nvkm_object *, + struct nvkm_oclass *, void *, u32, + struct nvkm_object **); struct nv50_clk_oclass { - struct nouveau_oclass base; - struct nouveau_domain *domains; + struct nvkm_oclass base; + struct nvkm_domain *domains; }; - #endif |