drm/nouveau/pm: 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, 8 insertions, 10 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
index e83a0efd5d89..2338e150420e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
@@ -1,26 +1,24 @@
 #ifndef __NVKM_PM_NV40_H__
 #define __NVKM_PM_NV40_H__
-
 #include "priv.h"
 
 struct nv40_pm_oclass {
-	struct nouveau_oclass base;
-	const struct nouveau_specdom *doms;
+	struct nvkm_oclass base;
+	const struct nvkm_specdom *doms;
 };
 
 struct nv40_pm_priv {
-	struct nouveau_pm base;
+	struct nvkm_pm base;
 	u32 sequence;
 };
 
-int nv40_pm_ctor(struct nouveau_object *, struct nouveau_object *,
-		      struct nouveau_oclass *, void *data, u32 size,
-		      struct nouveau_object **pobject);
+int nv40_pm_ctor(struct nvkm_object *, struct nvkm_object *,
+		      struct nvkm_oclass *, void *data, u32 size,
+		      struct nvkm_object **pobject);
 
 struct nv40_pm_cntr {
-	struct nouveau_perfctr base;
+	struct nvkm_perfctr base;
 };
 
-extern const struct nouveau_funcdom nv40_perfctr_func;
-
+extern const struct nvkm_funcdom nv40_perfctr_func;
 #endif