From 1e9b294e6c72703714f1e75846913de47f969ec9 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sun, 8 Nov 2015 12:26:01 +1000 Subject: nvif: split out client interface definitions Signed-off-by: Ben Skeggs --- bin/util.h | 1 + drm/nouveau/include/nvif/class.h | 13 ------------- drm/nouveau/include/nvif/if0000.h | 12 ++++++++++++ drm/nouveau/nvkm/core/client.c | 1 + 4 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 drm/nouveau/include/nvif/if0000.h 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 #include +#include #include 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 #include +#include #include struct nvkm_client_notify { -- cgit v1.2.3