diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 15:08:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:56 +1000 |
| commit | d7e5fcd2e7455094d6f8326b00f70864a700017a (patch) | |
| tree | 1a7f69ffb6e3e4038664430a708f323aaf50a520 /drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | |
| parent | drm/nouveau/ltc: namespace + nvidia gpu names (no binary change) (diff) | |
| download | linux-d7e5fcd2e7455094d6f8326b00f70864a700017a.tar.gz linux-d7e5fcd2e7455094d6f8326b00f70864a700017a.zip | |
drm/nouveau/mc: 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/mc.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h index af7926f3a93d..055bea7702a1 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h @@ -1,31 +1,28 @@ -#ifndef __NOUVEAU_MC_H__ -#define __NOUVEAU_MC_H__ - +#ifndef __NVKM_MC_H__ +#define __NVKM_MC_H__ #include <core/subdev.h> -#include <core/device.h> -struct nouveau_mc { - struct nouveau_subdev base; +struct nvkm_mc { + struct nvkm_subdev base; bool use_msi; unsigned int irq; - void (*unk260)(struct nouveau_mc *, u32); + void (*unk260)(struct nvkm_mc *, u32); }; -static inline struct nouveau_mc * -nouveau_mc(void *obj) +static inline struct nvkm_mc * +nvkm_mc(void *obj) { - return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_MC); + return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_MC); } -extern struct nouveau_oclass *nv04_mc_oclass; -extern struct nouveau_oclass *nv40_mc_oclass; -extern struct nouveau_oclass *nv44_mc_oclass; -extern struct nouveau_oclass *nv4c_mc_oclass; -extern struct nouveau_oclass *nv50_mc_oclass; -extern struct nouveau_oclass *nv94_mc_oclass; -extern struct nouveau_oclass *nv98_mc_oclass; -extern struct nouveau_oclass *nvc0_mc_oclass; -extern struct nouveau_oclass *nvc3_mc_oclass; -extern struct nouveau_oclass *gk20a_mc_oclass; - +extern struct nvkm_oclass *nv04_mc_oclass; +extern struct nvkm_oclass *nv40_mc_oclass; +extern struct nvkm_oclass *nv44_mc_oclass; +extern struct nvkm_oclass *nv4c_mc_oclass; +extern struct nvkm_oclass *nv50_mc_oclass; +extern struct nvkm_oclass *g94_mc_oclass; +extern struct nvkm_oclass *g98_mc_oclass; +extern struct nvkm_oclass *gf100_mc_oclass; +extern struct nvkm_oclass *gf106_mc_oclass; +extern struct nvkm_oclass *gk20a_mc_oclass; #endif |