1 files changed, 11 insertions, 16 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
index 64be69fc9572..aca146377d36 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
@@ -56,19 +56,6 @@ nv40_ramfc[] = {
         {}
 };
 
-static struct nvkm_oclass
-nv40_fifo_cclass = {
-        .handle = NV_ENGCTX(FIFO, 0x40),
-        .ofuncs = &(struct nvkm_ofuncs) {
-                .ctor = nv04_fifo_context_ctor,
-                .dtor = _nvkm_fifo_context_dtor,
-                .init = _nvkm_fifo_context_init,
-                .fini = _nvkm_fifo_context_fini,
-                .rd32 = _nvkm_fifo_context_rd32,
-                .wr32 = _nvkm_fifo_context_wr32,
-        },
-};
-
 static int
 nv40_fifo_init(struct nvkm_object *object)
 {
@@ -115,7 +102,7 @@ nv40_fifo_init(struct nvkm_object *object)
                 break;
         }
 
-        nvkm_wr32(device, NV03_PFIFO_CACHE1_PUSH1, fifo->base.max);
+        nvkm_wr32(device, NV03_PFIFO_CACHE1_PUSH1, fifo->base.nr - 1);
 
         nvkm_wr32(device, NV03_PFIFO_INTR_0, 0xffffffff);
         nvkm_wr32(device, NV03_PFIFO_INTR_EN_0, 0xffffffff);
@@ -126,6 +113,14 @@ nv40_fifo_init(struct nvkm_object *object)
         return 0;
 }
 
+static const struct nvkm_fifo_func
+nv40_fifo_func = {
+        .chan = {
+                &nv40_fifo_dma_oclass,
+                NULL
+        },
+};
+
 static int
 nv40_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
                struct nvkm_oclass *oclass, void *data, u32 size,
@@ -139,10 +134,10 @@ nv40_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
         if (ret)
                 return ret;
 
+        fifo->base.func = &nv40_fifo_func;
+
         nv_subdev(fifo)->unit = 0x00000100;
         nv_subdev(fifo)->intr = nv04_fifo_intr;
-        nv_engine(fifo)->cclass = &nv40_fifo_cclass;
-        nv_engine(fifo)->sclass = nv40_fifo_sclass;
         fifo->base.pause = nv04_fifo_pause;
         fifo->base.start = nv04_fifo_start;
         fifo->ramfc_desc = nv40_ramfc;