drm/nouveau/instmem: 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>

1 files changed, 15 insertions, 19 deletions

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
index 4953e6c6c86b..d104c1aac807 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
@@ -1,19 +1,16 @@
-#ifndef __NOUVEAU_INSTMEM_H__
-#define __NOUVEAU_INSTMEM_H__
-
+#ifndef __NVKM_INSTMEM_H__
+#define __NVKM_INSTMEM_H__
 #include <core/subdev.h>
-#include <core/device.h>
-#include <core/mm.h>
 
-struct nouveau_instobj {
-	struct nouveau_object base;
+struct nvkm_instobj {
+	struct nvkm_object base;
 	struct list_head head;
 	u32 *suspend;
 	u64 addr;
 	u32 size;
 };
 
-static inline struct nouveau_instobj *
+static inline struct nvkm_instobj *
 nv_memobj(void *obj)
 {
 #if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
@@ -23,17 +20,17 @@ nv_memobj(void *obj)
 	return obj;
 }
 
-struct nouveau_instmem {
-	struct nouveau_subdev base;
+struct nvkm_instmem {
+	struct nvkm_subdev base;
 	struct list_head list;
 
 	u32 reserved;
-	int (*alloc)(struct nouveau_instmem *, struct nouveau_object *,
-		     u32 size, u32 align, struct nouveau_object **);
+	int (*alloc)(struct nvkm_instmem *, struct nvkm_object *,
+		     u32 size, u32 align, struct nvkm_object **);
 };
 
-static inline struct nouveau_instmem *
-nouveau_instmem(void *obj)
+static inline struct nvkm_instmem *
+nvkm_instmem(void *obj)
 {
 	/* nv04/nv40 impls need to create objects in their constructor,
 	 * which is before the subdev pointer is valid
@@ -42,11 +39,10 @@ nouveau_instmem(void *obj)
 	    nv_subidx(obj) == NVDEV_SUBDEV_INSTMEM)
 		return obj;
 
-	return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_INSTMEM);
+	return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_INSTMEM);
 }
 
-extern struct nouveau_oclass *nv04_instmem_oclass;
-extern struct nouveau_oclass *nv40_instmem_oclass;
-extern struct nouveau_oclass *nv50_instmem_oclass;
-
+extern struct nvkm_oclass *nv04_instmem_oclass;
+extern struct nvkm_oclass *nv40_instmem_oclass;
+extern struct nvkm_oclass *nv50_instmem_oclass;
 #endif