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

3 files changed, 67 insertions, 96 deletions

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/os.h b/drivers/gpu/drm/nouveau/include/nvkm/core/os.h
index 7894ff57514b..423086564735 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/os.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/os.h
@@ -240,5 +240,6 @@
 #define nvc0_pte_storage_type_map gf100_pte_storage_type_map
 #define nouveau_fuse nvkm_fuse
 #define nouveau_mc nvkm_mc
+#define nouveau_mmu nvkm_mmu
 
 #endif
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
index 639d0fd64cad..92cfcf5ae9d4 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
@@ -1,5 +1,6 @@
 #ifndef __NVKM_CE_H__
 #define __NVKM_CE_H__
+#include <core/engine.h>
 
 void nva3_ce_intr(struct nouveau_subdev *);
 
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
index 2c3b29967ea4..3a5368776c31 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
@@ -1,72 +1,44 @@
-/*
- * Copyright 2010 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-
-#ifndef __NOUVEAU_MMU_H__
-#define __NOUVEAU_MMU_H__
-
-#include <core/object.h>
+#ifndef __NVKM_MMU_H__
+#define __NVKM_MMU_H__
 #include <core/subdev.h>
-#include <core/device.h>
 #include <core/mm.h>
+struct nvkm_device;
+struct nvkm_mem;
 
-struct nouveau_vm_pgt {
-        struct nouveau_gpuobj *obj[2];
+struct nvkm_vm_pgt {
+        struct nvkm_gpuobj *obj[2];
         u32 refcount[2];
 };
 
-struct nouveau_vm_pgd {
+struct nvkm_vm_pgd {
         struct list_head head;
-        struct nouveau_gpuobj *obj;
+        struct nvkm_gpuobj *obj;
 };
 
-struct nouveau_gpuobj;
-struct nouveau_mem;
-
-struct nouveau_vma {
+struct nvkm_vma {
         struct list_head head;
         int refcount;
-        struct nouveau_vm *vm;
-        struct nouveau_mm_node *node;
+        struct nvkm_vm *vm;
+        struct nvkm_mm_node *node;
         u64 offset;
         u32 access;
 };
 
-struct nouveau_vm {
-        struct nouveau_mmu *mmu;
-        struct nouveau_mm mm;
+struct nvkm_vm {
+        struct nvkm_mmu *mmu;
+        struct nvkm_mm mm;
         struct kref refcount;
 
         struct list_head pgd_list;
         atomic_t engref[NVDEV_SUBDEV_NR];
 
-        struct nouveau_vm_pgt *pgt;
+        struct nvkm_vm_pgt *pgt;
         u32 fpde;
         u32 lpde;
 };
 
-struct nouveau_mmu {
-        struct nouveau_subdev base;
+struct nvkm_mmu {
+        struct nvkm_subdev base;
 
         u64 limit;
         u8  dma_bits;
@@ -74,62 +46,59 @@ struct nouveau_mmu {
         u8  spg_shift;
         u8  lpg_shift;
 
-        int  (*create)(struct nouveau_mmu *, u64 offset, u64 length,
-                       u64 mm_offset, struct nouveau_vm **);
+        int  (*create)(struct nvkm_mmu *, u64 offset, u64 length,
+                       u64 mm_offset, struct nvkm_vm **);
 
-        void (*map_pgt)(struct nouveau_gpuobj *pgd, u32 pde,
-                        struct nouveau_gpuobj *pgt[2]);
-        void (*map)(struct nouveau_vma *, struct nouveau_gpuobj *,
-                    struct nouveau_mem *, u32 pte, u32 cnt,
+        void (*map_pgt)(struct nvkm_gpuobj *pgd, u32 pde,
+                        struct nvkm_gpuobj *pgt[2]);
+        void (*map)(struct nvkm_vma *, struct nvkm_gpuobj *,
+                    struct nvkm_mem *, u32 pte, u32 cnt,
                     u64 phys, u64 delta);
-        void (*map_sg)(struct nouveau_vma *, struct nouveau_gpuobj *,
-                       struct nouveau_mem *, u32 pte, u32 cnt, dma_addr_t *);
-        void (*unmap)(struct nouveau_gpuobj *pgt, u32 pte, u32 cnt);
-        void (*flush)(struct nouveau_vm *);
+        void (*map_sg)(struct nvkm_vma *, struct nvkm_gpuobj *,
+                       struct nvkm_mem *, u32 pte, u32 cnt, dma_addr_t *);
+        void (*unmap)(struct nvkm_gpuobj *pgt, u32 pte, u32 cnt);
+        void (*flush)(struct nvkm_vm *);
 };
 
-static inline struct nouveau_mmu *
-nouveau_mmu(void *obj)
+static inline struct nvkm_mmu *
+nvkm_mmu(void *obj)
 {
-        return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_MMU);
+        return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_MMU);
 }
 
-#define nouveau_mmu_create(p,e,o,i,f,d)                                      \
-        nouveau_subdev_create((p), (e), (o), 0, (i), (f), (d))
-#define nouveau_mmu_destroy(p)                                               \
-        nouveau_subdev_destroy(&(p)->base)
-#define nouveau_mmu_init(p)                                                  \
-        nouveau_subdev_init(&(p)->base)
-#define nouveau_mmu_fini(p,s)                                                \
-        nouveau_subdev_fini(&(p)->base, (s))
-
-#define _nouveau_mmu_dtor _nouveau_subdev_dtor
-#define _nouveau_mmu_init _nouveau_subdev_init
-#define _nouveau_mmu_fini _nouveau_subdev_fini
-
-extern struct nouveau_oclass nv04_mmu_oclass;
-extern struct nouveau_oclass nv41_mmu_oclass;
-extern struct nouveau_oclass nv44_mmu_oclass;
-extern struct nouveau_oclass nv50_mmu_oclass;
-extern struct nouveau_oclass nvc0_mmu_oclass;
-
-int  nv04_vm_create(struct nouveau_mmu *, u64, u64, u64,
-                    struct nouveau_vm **);
-void nv04_mmu_dtor(struct nouveau_object *);
-
-/* nouveau_vm.c */
-int  nouveau_vm_create(struct nouveau_mmu *, u64 offset, u64 length,
-                       u64 mm_offset, u32 block, struct nouveau_vm **);
-int  nouveau_vm_new(struct nouveau_device *, u64 offset, u64 length,
-                    u64 mm_offset, struct nouveau_vm **);
-int  nouveau_vm_ref(struct nouveau_vm *, struct nouveau_vm **,
-                    struct nouveau_gpuobj *pgd);
-int  nouveau_vm_get(struct nouveau_vm *, u64 size, u32 page_shift,
-                    u32 access, struct nouveau_vma *);
-void nouveau_vm_put(struct nouveau_vma *);
-void nouveau_vm_map(struct nouveau_vma *, struct nouveau_mem *);
-void nouveau_vm_map_at(struct nouveau_vma *, u64 offset, struct nouveau_mem *);
-void nouveau_vm_unmap(struct nouveau_vma *);
-void nouveau_vm_unmap_at(struct nouveau_vma *, u64 offset, u64 length);
-
+#define nvkm_mmu_create(p,e,o,i,f,d)                                      \
+        nvkm_subdev_create((p), (e), (o), 0, (i), (f), (d))
+#define nvkm_mmu_destroy(p)                                               \
+        nvkm_subdev_destroy(&(p)->base)
+#define nvkm_mmu_init(p)                                                  \
+        nvkm_subdev_init(&(p)->base)
+#define nvkm_mmu_fini(p,s)                                                \
+        nvkm_subdev_fini(&(p)->base, (s))
+
+#define _nvkm_mmu_dtor _nvkm_subdev_dtor
+#define _nvkm_mmu_init _nvkm_subdev_init
+#define _nvkm_mmu_fini _nvkm_subdev_fini
+
+extern struct nvkm_oclass nv04_mmu_oclass;
+extern struct nvkm_oclass nv41_mmu_oclass;
+extern struct nvkm_oclass nv44_mmu_oclass;
+extern struct nvkm_oclass nv50_mmu_oclass;
+extern struct nvkm_oclass gf100_mmu_oclass;
+
+int  nv04_vm_create(struct nvkm_mmu *, u64, u64, u64,
+                    struct nvkm_vm **);
+void nv04_mmu_dtor(struct nvkm_object *);
+
+int  nvkm_vm_create(struct nvkm_mmu *, u64 offset, u64 length, u64 mm_offset,
+                    u32 block, struct nvkm_vm **);
+int  nvkm_vm_new(struct nvkm_device *, u64 offset, u64 length, u64 mm_offset,
+                 struct nvkm_vm **);
+int  nvkm_vm_ref(struct nvkm_vm *, struct nvkm_vm **, struct nvkm_gpuobj *pgd);
+int  nvkm_vm_get(struct nvkm_vm *, u64 size, u32 page_shift, u32 access,
+                 struct nvkm_vma *);
+void nvkm_vm_put(struct nvkm_vma *);
+void nvkm_vm_map(struct nvkm_vma *, struct nvkm_mem *);
+void nvkm_vm_map_at(struct nvkm_vma *, u64 offset, struct nvkm_mem *);
+void nvkm_vm_unmap(struct nvkm_vma *);
+void nvkm_vm_unmap_at(struct nvkm_vma *, u64 offset, u64 length);
 #endif