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

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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
index 1b85ffe..95a64d8 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/class.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
@@ -251,13 +251,13 @@ struct gf100_dma_v0 {
        __u8  pad03[5];
 };
 
-struct gf110_dma_v0 {
+struct gf119_dma_v0 {
        __u8  version;
-#define GF110_DMA_V0_PAGE_LP                                               0x00
-#define GF110_DMA_V0_PAGE_SP                                               0x01
+#define GF119_DMA_V0_PAGE_LP                                               0x00
+#define GF119_DMA_V0_PAGE_SP                                               0x01
        __u8  page;
-#define GF110_DMA_V0_KIND_PITCH                                            0x00
-#define GF110_DMA_V0_KIND_VM                                               0xff
+#define GF119_DMA_V0_KIND_PITCH                                            0x00
+#define GF119_DMA_V0_KIND_VM                                               0xff
        __u8  kind;
        __u8  pad03[5];
 };

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
index 7439a02..114bfb7 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
@@ -2,7 +2,6 @@
 #define __NVKM_DMA_H__
 #include <core/engine.h>
 struct nvkm_client;
-struct nvkm_gpuobj;
 
 struct nvkm_dmaobj {
        const struct nvkm_dmaobj_func *func;
@@ -18,20 +17,16 @@ struct nvkm_dmaobj {
        u64 handle; /*XXX HANDLE MERGE */
 };
 
-struct nvkm_dmaobj_func {
-       int (*bind)(struct nvkm_dmaobj *, struct nvkm_gpuobj *, int align,
-                   struct nvkm_gpuobj **);
-};
-
 struct nvkm_dma {
+       const struct nvkm_dma_func *func;
        struct nvkm_engine engine;
 };
 
 struct nvkm_dmaobj *
 nvkm_dma_search(struct nvkm_dma *, struct nvkm_client *, u64 object);
 
-extern struct nvkm_oclass *nv04_dmaeng_oclass;
-extern struct nvkm_oclass *nv50_dmaeng_oclass;
-extern struct nvkm_oclass *gf100_dmaeng_oclass;
-extern struct nvkm_oclass *gf110_dmaeng_oclass;
+int nv04_dma_new(struct nvkm_device *, int, struct nvkm_dma **);
+int nv50_dma_new(struct nvkm_device *, int, struct nvkm_dma **);
+int gf100_dma_new(struct nvkm_device *, int, struct nvkm_dma **);
+int gf119_dma_new(struct nvkm_device *, int, struct nvkm_dma **);
 #endif

diff --cc drivers/gpu/drm/nouveau/nv50_display.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/nv20.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/nv30.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/Kbuild
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/gf119.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
Simple merge