drm/nouveau/core/object: separate oclass data out into its own header

Want to be able to include this from core/device.h without pulling in
core/object.h.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
index 96dda35..5a092ff 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
@@ -1,10 +1,8 @@
 #ifndef __NVKM_OBJECT_H__
 #define __NVKM_OBJECT_H__
-#include <core/os.h>
-#include <core/debug.h>
+#include <core/oclass.h>
 struct nvkm_event;
 struct nvkm_gpuobj;
-struct nvkm_oclass;
 
 struct nvkm_object {
        const struct nvkm_object_func *func;
@@ -66,28 +64,4 @@ bool nvkm_object_insert(struct nvkm_object *);
 void nvkm_object_remove(struct nvkm_object *);
 struct nvkm_object *nvkm_object_search(struct nvkm_client *, u64 object,
                                       const struct nvkm_object_func *);
-
-struct nvkm_sclass {
-       int minver;
-       int maxver;
-       s32 oclass;
-       const struct nvkm_object_func *func;
-       int (*ctor)(const struct nvkm_oclass *, void *data, u32 size,
-                   struct nvkm_object **);
-};
-
-struct nvkm_oclass {
-       int (*ctor)(const struct nvkm_oclass *, void *data, u32 size,
-                   struct nvkm_object **);
-       struct nvkm_sclass base;
-       const void *priv;
-       const void *engn;
-       u32 handle;
-       u8  route;
-       u64 token;
-       u64 object;
-       struct nvkm_client *client;
-       struct nvkm_object *parent;
-       struct nvkm_engine *engine;
-};
 #endif

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h b/drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h
new file mode 100644 (file)
index 0000000..8e1b945
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h
@@ -0,0 +1,31 @@
+#ifndef __NVKM_OCLASS_H__
+#define __NVKM_OCLASS_H__
+#include <core/os.h>
+#include <core/debug.h>
+struct nvkm_oclass;
+struct nvkm_object;
+
+struct nvkm_sclass {
+       int minver;
+       int maxver;
+       s32 oclass;
+       const struct nvkm_object_func *func;
+       int (*ctor)(const struct nvkm_oclass *, void *data, u32 size,
+                   struct nvkm_object **);
+};
+
+struct nvkm_oclass {
+       int (*ctor)(const struct nvkm_oclass *, void *data, u32 size,
+                   struct nvkm_object **);
+       struct nvkm_sclass base;
+       const void *priv;
+       const void *engn;
+       u32 handle;
+       u8  route;
+       u64 token;
+       u64 object;
+       struct nvkm_client *client;
+       struct nvkm_object *parent;
+       struct nvkm_engine *engine;
+};
+#endif