summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/include
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-14 08:30:22 +0300
committerBen Skeggs <bskeggs@redhat.com>2015-01-22 05:18:03 +0300
commit87a876579abd1df8479ad90974492ec0a145d165 (patch)
tree7cb30fa4f2f9c1e696c52876c27c16d23c6a2cf9 /drivers/gpu/drm/nouveau/include
parente3332c20e016224f10e7ae3ccbaa630588c9004c (diff)
downloadlinux-87a876579abd1df8479ad90974492ec0a145d165.tar.xz
drm/nouveau/msppp: 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/engine/msppp.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h
index 5f2f82ed9598..c6c69d0a8d01 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h
@@ -1,7 +1,6 @@
-#ifndef __NOUVEAU_MSPPP_H__
-#define __NOUVEAU_MSPPP_H__
-
-extern struct nouveau_oclass nv98_msppp_oclass;
-extern struct nouveau_oclass nvc0_msppp_oclass;
-
+#ifndef __NVKM_MSPPP_H__
+#define __NVKM_MSPPP_H__
+#include <core/engine.h>
+extern struct nvkm_oclass g98_msppp_oclass;
+extern struct nvkm_oclass gf100_msppp_oclass;
#endif