summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-14 08:36:34 +0300
committerBen Skeggs <bskeggs@redhat.com>2015-01-22 05:18:07 +0300
commitbe83cd4ef9a2a56bd35550bf96146b7b837daf02 (patch)
tree7cd92cdbb6c9fa473f4b896e8bd22e9dc8cbc28e /drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
parent9719047b4d985ca7a46819956047cca04213d63e (diff)
downloadlinux-be83cd4ef9a2a56bd35550bf96146b7b837daf02.tar.xz
drm/nouveau: finalise nvkm namespace switch (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/nvkm/subdev/mxm/mxms.h')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
index 5e0be0c591ca..4ef804012d06 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
@@ -1,5 +1,6 @@
#ifndef __NVMXM_MXMS_H__
#define __NVMXM_MXMS_H__
+#include <subdev/mxm.h>
struct mxms_odev {
u8 outp_type;
@@ -8,15 +9,14 @@ struct mxms_odev {
u8 dig_conn;
};
-void mxms_output_device(struct nouveau_mxm *, u8 *, struct mxms_odev *);
+void mxms_output_device(struct nvkm_mxm *, u8 *, struct mxms_odev *);
-u16 mxms_version(struct nouveau_mxm *);
-u16 mxms_headerlen(struct nouveau_mxm *);
-u16 mxms_structlen(struct nouveau_mxm *);
-bool mxms_checksum(struct nouveau_mxm *);
-bool mxms_valid(struct nouveau_mxm *);
-
-bool mxms_foreach(struct nouveau_mxm *, u8,
- bool (*)(struct nouveau_mxm *, u8 *, void *), void *);
+u16 mxms_version(struct nvkm_mxm *);
+u16 mxms_headerlen(struct nvkm_mxm *);
+u16 mxms_structlen(struct nvkm_mxm *);
+bool mxms_checksum(struct nvkm_mxm *);
+bool mxms_valid(struct nvkm_mxm *);
+bool mxms_foreach(struct nvkm_mxm *, u8,
+ bool (*)(struct nvkm_mxm *, u8 *, void *), void *);
#endif