diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-11-08 12:26:01 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2016-01-11 11:15:10 +1000 |
commit | 5c6611f1887e723e830fbdcac8a4e2d537a0846c (patch) | |
tree | 28b8f59c812abd1b442e1f9de3cc28c12f87a7be | |
parent | e3229cf0d204e86afda733bad215f160c3eb0d65 (diff) | |
download | nouveau-5c6611f1887e723e830fbdcac8a4e2d537a0846c.tar.gz |
nvif: split out client interface definitions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | bin/util.h | 1 | ||||
-rw-r--r-- | drm/nouveau/include/nvif/class.h | 13 | ||||
-rw-r--r-- | drm/nouveau/include/nvif/if0000.h | 12 | ||||
-rw-r--r-- | drm/nouveau/nvkm/core/client.c | 1 |
4 files changed, 14 insertions, 13 deletions
diff --git a/bin/util.h b/bin/util.h index c3f6edfef..7c10606ff 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 9ca13d13d..4179cd65a 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 000000000..85c44e8a1 --- /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 297e1e953..98e694179 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 { |