summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-11-08 12:26:01 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-11-25 15:38:14 +1000
commit1e9b294e6c72703714f1e75846913de47f969ec9 (patch)
treec8ff62e9a5b685567ae58cff130b84ac2445f840
parent261cdd2d268e8ef202bd53ff95efa82e46592055 (diff)
nvif: split out client interface definitions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--bin/util.h1
-rw-r--r--drm/nouveau/include/nvif/class.h13
-rw-r--r--drm/nouveau/include/nvif/if0000.h12
-rw-r--r--drm/nouveau/nvkm/core/client.c1
4 files changed, 14 insertions, 13 deletions
diff --git a/bin/util.h b/bin/util.h
index c3f6edfe..7c10606f 100644
--- a/bin/util.h
+++ b/bin/util.h
@@ -2,6 +2,7 @@
#define __UTIL_H__
#include <nvif/client.h>
#include <nvif/device.h>
+#include <nvif/if0000.h>
#include <unistd.h>
diff --git a/drm/nouveau/include/nvif/class.h b/drm/nouveau/include/nvif/class.h
index 9ca13d13..4179cd65 100644
--- a/drm/nouveau/include/nvif/class.h
+++ b/drm/nouveau/include/nvif/class.h
@@ -138,17 +138,4 @@
#define MAXWELL_COMPUTE_B 0x0000b1c0
#define NV74_CIPHER 0x000074c1
-
-/*******************************************************************************
- * client
- ******************************************************************************/
-
-#define NV_CLIENT_DEVLIST 0x00
-
-struct nv_client_devlist_v0 {
- __u8 version;
- __u8 count;
- __u8 pad02[6];
- __u64 device[];
-};
#endif
diff --git a/drm/nouveau/include/nvif/if0000.h b/drm/nouveau/include/nvif/if0000.h
new file mode 100644
index 00000000..85c44e8a
--- /dev/null
+++ b/drm/nouveau/include/nvif/if0000.h
@@ -0,0 +1,12 @@
+#ifndef __NVIF_IF0000_H__
+#define __NVIF_IF0000_H__
+
+#define NV_CLIENT_DEVLIST 0x00
+
+struct nv_client_devlist_v0 {
+ __u8 version;
+ __u8 count;
+ __u8 pad02[6];
+ __u64 device[];
+};
+#endif
diff --git a/drm/nouveau/nvkm/core/client.c b/drm/nouveau/nvkm/core/client.c
index 297e1e95..98e69417 100644
--- a/drm/nouveau/nvkm/core/client.c
+++ b/drm/nouveau/nvkm/core/client.c
@@ -28,6 +28,7 @@
#include <nvif/class.h>
#include <nvif/event.h>
+#include <nvif/if0000.h>
#include <nvif/unpack.h>
struct nvkm_client_notify {