drm/nouveau/sw: convert user classes to new-style nvkm_object

[deliverable/linux.git] / drivers / gpu / drm / nouveau / nvkm / engine / sw / nvsw.h

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
index c54a12798e847b7cab3cb8a2573754cc7194c8b3..943ef4c10091c4ba8d5b71de2f68f097f3285489 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
@@ -1,10 +1,21 @@
 #ifndef __NVKM_NVSW_H__
 #define __NVKM_NVSW_H__
+#define nvkm_nvsw(p) container_of((p), struct nvkm_nvsw, object)
 #include "priv.h"
 
-extern struct nvkm_ofuncs nvkm_nvsw_ofuncs;
-int
-nvkm_nvsw_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-              struct nvkm_oclass *oclass, void *data, u32 size,
-              struct nvkm_object **pobject);
+struct nvkm_nvsw {
+       struct nvkm_object object;
+       const struct nvkm_nvsw_func *func;
+       struct nvkm_sw_chan *chan;
+};
+
+struct nvkm_nvsw_func {
+       int (*mthd)(struct nvkm_nvsw *, u32 mthd, void *data, u32 size);
+};
+
+int nvkm_nvsw_new_(const struct nvkm_nvsw_func *, struct nvkm_sw_chan *,
+                  const struct nvkm_oclass *, void *data, u32 size,
+                  struct nvkm_object **pobject);
+int nvkm_nvsw_new(struct nvkm_sw_chan *, const struct nvkm_oclass *,
+                 void *data, u32 size, struct nvkm_object **pobject);
 #endif