summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-14 14:11:21 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-01-22 12:17:49 +1000
commit5025407b9862349d17b1dff25737aaef6520a439 (patch)
tree6d11493365d06c00d79daf5818b42dfa2d421c1e /drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
parent989aa5b76ad2af7653353cf01bdebec2ba9436aa (diff)
downloadop-kernel-dev-5025407b9862349d17b1dff25737aaef6520a439.zip
op-kernel-dev-5025407b9862349d17b1dff25737aaef6520a439.tar.gz
drm/nouveau/core: 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/core/ramht.h')
-rw-r--r--drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h23
1 files changed, 10 insertions, 13 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h b/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
index e510143..cc132ea 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
@@ -1,23 +1,20 @@
-#ifndef __NOUVEAU_RAMHT_H__
-#define __NOUVEAU_RAMHT_H__
-
+#ifndef __NVKM_RAMHT_H__
+#define __NVKM_RAMHT_H__
#include <core/gpuobj.h>
-struct nouveau_ramht {
- struct nouveau_gpuobj gpuobj;
+struct nvkm_ramht {
+ struct nvkm_gpuobj gpuobj;
int bits;
};
-int nouveau_ramht_insert(struct nouveau_ramht *, int chid,
- u32 handle, u32 context);
-void nouveau_ramht_remove(struct nouveau_ramht *, int cookie);
-int nouveau_ramht_new(struct nouveau_object *, struct nouveau_object *,
- u32 size, u32 align, struct nouveau_ramht **);
+int nvkm_ramht_insert(struct nvkm_ramht *, int chid, u32 handle, u32 context);
+void nvkm_ramht_remove(struct nvkm_ramht *, int cookie);
+int nvkm_ramht_new(struct nvkm_object *, struct nvkm_object *, u32 size,
+ u32 align, struct nvkm_ramht **);
static inline void
-nouveau_ramht_ref(struct nouveau_ramht *obj, struct nouveau_ramht **ref)
+nvkm_ramht_ref(struct nvkm_ramht *obj, struct nvkm_ramht **ref)
{
- nouveau_gpuobj_ref(&obj->gpuobj, (struct nouveau_gpuobj **)ref);
+ nvkm_gpuobj_ref(&obj->gpuobj, (struct nvkm_gpuobj **)ref);
}
-
#endif
OpenPOWER on IntegriCloud