diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 14:35:35 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:50 +1000 |
| commit | 245dcfe96f6900dbf64e48a350badf4c90fabc2e (patch) | |
| tree | 11c650ae29cb597cf1662c2828db80bc947b65f4 /drivers/gpu/drm/nouveau/include | |
| parent | 5025407b9862349d17b1dff25737aaef6520a439 (diff) | |
drm/nouveau/bar: 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/core/os.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h | 44 |
2 files changed, 22 insertions, 24 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/os.h b/drivers/gpu/drm/nouveau/include/nvkm/core/os.h index 0b5a1e4dff48..18e5edde08bd 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/os.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/os.h @@ -137,6 +137,8 @@ #define nouveau_vm_put nvkm_vm_put #define nouveau_vm_map nvkm_vm_map #define nouveau_vm_unmap nvkm_vm_unmap +#define nouveau_vm_new nvkm_vm_new +#define nouveau_vm_ref nvkm_vm_ref #define nouveau_instmem nvkm_instmem #define nouveau_instobj nvkm_instobj #define nouveau_mem nvkm_mem diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h index 960e33a30819..c7a007b8bc10 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h @@ -1,37 +1,33 @@ -#ifndef __NOUVEAU_BAR_H__ -#define __NOUVEAU_BAR_H__ - +#ifndef __NVKM_BAR_H__ +#define __NVKM_BAR_H__ #include <core/subdev.h> -#include <core/device.h> - -struct nouveau_mem; -struct nouveau_vma; +struct nvkm_mem; +struct nvkm_vma; -struct nouveau_bar { - struct nouveau_subdev base; +struct nvkm_bar { + struct nvkm_subdev base; - int (*alloc)(struct nouveau_bar *, struct nouveau_object *, - struct nouveau_mem *, struct nouveau_object **); + int (*alloc)(struct nvkm_bar *, struct nvkm_object *, + struct nvkm_mem *, struct nvkm_object **); - int (*kmap)(struct nouveau_bar *, struct nouveau_mem *, - u32 flags, struct nouveau_vma *); - int (*umap)(struct nouveau_bar *, struct nouveau_mem *, - u32 flags, struct nouveau_vma *); - void (*unmap)(struct nouveau_bar *, struct nouveau_vma *); - void (*flush)(struct nouveau_bar *); + int (*kmap)(struct nvkm_bar *, struct nvkm_mem *, u32 flags, + struct nvkm_vma *); + int (*umap)(struct nvkm_bar *, struct nvkm_mem *, u32 flags, + struct nvkm_vma *); + void (*unmap)(struct nvkm_bar *, struct nvkm_vma *); + void (*flush)(struct nvkm_bar *); /* whether the BAR supports to be ioremapped WC or should be uncached */ bool iomap_uncached; }; -static inline struct nouveau_bar * -nouveau_bar(void *obj) +static inline struct nvkm_bar * +nvkm_bar(void *obj) { - return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_BAR); + return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_BAR); } -extern struct nouveau_oclass nv50_bar_oclass; -extern struct nouveau_oclass nvc0_bar_oclass; -extern struct nouveau_oclass gk20a_bar_oclass; - +extern struct nvkm_oclass nv50_bar_oclass; +extern struct nvkm_oclass gf100_bar_oclass; +extern struct nvkm_oclass gk20a_bar_oclass; #endif |