drm/nouveau/dma: convert to new-style nvkm_engine

[deliverable/linux.git] / drivers / gpu / drm / nouveau / nvkm / engine / dma / priv.h

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
index fbff168e6cc8f1496d2552a552fb17f694e0b5d9..deb37ee55c0b5ab900d534267319675bb90ba47c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
@@ -3,18 +3,15 @@
 #define nvkm_dma(p) container_of((p), struct nvkm_dma, engine)
 #include <engine/dma.h>
 
-int _nvkm_dma_ctor(struct nvkm_object *, struct nvkm_object *,
-                     struct nvkm_oclass *, void *, u32,
-                     struct nvkm_object **);
-#define _nvkm_dma_dtor _nvkm_engine_dtor
-#define _nvkm_dma_init _nvkm_engine_init
-#define _nvkm_dma_fini _nvkm_engine_fini
-
-struct nvkm_dma_impl {
-       struct nvkm_oclass base;
-       struct nvkm_oclass *sclass;
-       int (*bind)(struct nvkm_dmaobj *, struct nvkm_gpuobj *,
+struct nvkm_dmaobj_func {
+       int (*bind)(struct nvkm_dmaobj *, struct nvkm_gpuobj *, int align,
                    struct nvkm_gpuobj **);
+};
+
+int nvkm_dma_new_(const struct nvkm_dma_func *, struct nvkm_device *,
+                 int index, struct nvkm_dma **);
+
+struct nvkm_dma_func {
        int (*class_new)(struct nvkm_dma *, const struct nvkm_oclass *,
                         void *data, u32 size, struct nvkm_dmaobj **);
 };