u32  size;
        } data;
        void (*init)(struct nvkm_falcon *);
-       void (*intr)(struct nvkm_falcon *, struct nvkm_fifo_chan *);
+       void (*intr)(struct nvkm_falcon *, struct nvkm_chan *);
 
        u32 debug;
        u32 fbif;
 
        struct nvkm_fifo_engn engn[NVKM_FIFO_ENGN_NR];
 };
 
+struct nvkm_chan *nvkm_chan_get_chid(struct nvkm_engine *, int id, unsigned long *irqflags);
+struct nvkm_chan *nvkm_chan_get_inst(struct nvkm_engine *, u64 inst, unsigned long *irqflags);
+void nvkm_chan_put(struct nvkm_chan **, unsigned long irqflags);
+
 struct nvkm_fifo {
        const struct nvkm_fifo_func *func;
        struct nvkm_engine engine;
 void nvkm_fifo_pause(struct nvkm_fifo *, unsigned long *);
 void nvkm_fifo_start(struct nvkm_fifo *, unsigned long *);
 
-void nvkm_fifo_chan_put(struct nvkm_fifo *, unsigned long flags,
-                       struct nvkm_fifo_chan **);
-struct nvkm_fifo_chan *
-nvkm_fifo_chan_inst(struct nvkm_fifo *, u64 inst, unsigned long *flags);
-struct nvkm_fifo_chan *
-nvkm_fifo_chan_chid(struct nvkm_fifo *, int chid, unsigned long *flags);
-
 int nv04_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);
 int nv10_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);
 int nv17_fifo_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fifo **);
 
 };
 
 void
-gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_fifo_chan *chan)
+gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_chan *chan)
 {
        struct nvkm_subdev *subdev = &ce->engine.subdev;
        struct nvkm_device *device = subdev->device;
 
        nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] ch %d [%010llx %s] "
                           "subc %d mthd %04x data %08x\n", ssta,
-                  en ? en->name : "", chan ? chan->chid : -1,
+                  en ? en->name : "", chan ? chan->id : -1,
                   chan ? chan->inst->addr : 0,
-                  chan ? chan->object.client->name : "unknown",
+                  chan ? chan->name : "unknown",
                   subc, mthd, data);
 }
 
 
 {
        struct nvkm_subdev *subdev = &cipher->subdev;
        struct nvkm_device *device = subdev->device;
-       struct nvkm_fifo *fifo = device->fifo;
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        u32 stat = nvkm_rd32(device, 0x102130);
        u32 mthd = nvkm_rd32(device, 0x102190);
        u32 data = nvkm_rd32(device, 0x102194);
        unsigned long flags;
        char msg[128];
 
-       chan = nvkm_fifo_chan_inst(fifo, (u64)inst << 12, &flags);
+       chan = nvkm_chan_get_inst(cipher, (u64)inst << 12, &flags);
        if (stat) {
                nvkm_snprintbf(msg, sizeof(msg), g84_cipher_intr_mask, stat);
                nvkm_error(subdev,  "%08x [%s] ch %d [%010llx %s] "
                                    "mthd %04x data %08x\n", stat, msg,
-                          chan ? chan->chid : -1, (u64)inst << 12,
-                          chan ? chan->object.client->name : "unknown",
+                          chan ? chan->id : -1, (u64)inst << 12,
+                          chan ? chan->name : "unknown",
                           mthd, data);
        }
-       nvkm_fifo_chan_put(fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 
        nvkm_wr32(device, 0x102130, stat);
        nvkm_wr32(device, 0x10200c, 0x10);
 
        u32 dest = nvkm_rd32(device, base + 0x01c);
        u32 intr = nvkm_rd32(device, base + 0x008) & dest & ~(dest >> 16);
        u32 inst = nvkm_rd32(device, base + 0x050) & 0x3fffffff;
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        unsigned long flags;
 
-       chan = nvkm_fifo_chan_inst(device->fifo, (u64)inst << 12, &flags);
+       chan = nvkm_chan_get_inst(engine, (u64)inst << 12, &flags);
 
        if (intr & 0x00000040) {
                if (falcon->func->intr) {
                nvkm_wr32(device, base + 0x004, intr);
        }
 
-       nvkm_fifo_chan_put(device->fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 }
 
 static int
 
        return fifo->func->mmu_fault->recover(fifo, info);
 }
 
-void
-nvkm_fifo_chan_put(struct nvkm_fifo *fifo, unsigned long flags,
-                  struct nvkm_fifo_chan **pchan)
-{
-       struct nvkm_fifo_chan *chan = *pchan;
-       if (likely(chan)) {
-               *pchan = NULL;
-               spin_unlock_irqrestore(&fifo->lock, flags);
-       }
-}
-
-struct nvkm_fifo_chan *
-nvkm_fifo_chan_inst_locked(struct nvkm_fifo *fifo, u64 inst)
-{
-       struct nvkm_fifo_chan *chan;
-       list_for_each_entry(chan, &fifo->chan, head) {
-               if (chan->inst->addr == inst) {
-                       list_del(&chan->head);
-                       list_add(&chan->head, &fifo->chan);
-                       return chan;
-               }
-       }
-       return NULL;
-}
-
-struct nvkm_fifo_chan *
-nvkm_fifo_chan_inst(struct nvkm_fifo *fifo, u64 inst, unsigned long *rflags)
-{
-       struct nvkm_fifo_chan *chan;
-       unsigned long flags;
-       spin_lock_irqsave(&fifo->lock, flags);
-       if ((chan = nvkm_fifo_chan_inst_locked(fifo, inst))) {
-               *rflags = flags;
-               return chan;
-       }
-       spin_unlock_irqrestore(&fifo->lock, flags);
-       return NULL;
-}
-
-struct nvkm_fifo_chan *
-nvkm_fifo_chan_chid(struct nvkm_fifo *fifo, int chid, unsigned long *rflags)
-{
-       struct nvkm_fifo_chan *chan;
-       unsigned long flags;
-       spin_lock_irqsave(&fifo->lock, flags);
-       list_for_each_entry(chan, &fifo->chan, head) {
-               if (chan->chid == chid) {
-                       list_del(&chan->head);
-                       list_add(&chan->head, &fifo->chan);
-                       *rflags = flags;
-                       return chan;
-               }
-       }
-       spin_unlock_irqrestore(&fifo->lock, flags);
-       return NULL;
-}
-
 void
 nvkm_fifo_kevent(struct nvkm_fifo *fifo, int chid)
 {
 
        return data;
 }
 
+void
+nvkm_chan_put(struct nvkm_chan **pchan, unsigned long irqflags)
+{
+       struct nvkm_chan *chan = *pchan;
+
+       if (!chan)
+               return;
+
+       *pchan = NULL;
+       spin_unlock_irqrestore(&chan->cgrp->lock, irqflags);
+}
+
+struct nvkm_chan *
+nvkm_chan_get_inst(struct nvkm_engine *engine, u64 inst, unsigned long *pirqflags)
+{
+       struct nvkm_fifo *fifo = engine->subdev.device->fifo;
+       struct nvkm_runl *runl;
+       struct nvkm_engn *engn;
+       struct nvkm_chan *chan;
+
+       nvkm_runl_foreach(runl, fifo) {
+               nvkm_runl_foreach_engn(engn, runl) {
+                       if (engine == &fifo->engine || engn->engine == engine) {
+                               chan = nvkm_runl_chan_get_inst(runl, inst, pirqflags);
+                               if (chan || engn->engine == engine)
+                                       return chan;
+                       }
+               }
+       }
+
+       return NULL;
+}
+
+struct nvkm_chan *
+nvkm_chan_get_chid(struct nvkm_engine *engine, int id, unsigned long *pirqflags)
+{
+       struct nvkm_fifo *fifo = engine->subdev.device->fifo;
+       struct nvkm_runl *runl;
+       struct nvkm_engn *engn;
+
+       nvkm_runl_foreach(runl, fifo) {
+               nvkm_runl_foreach_engn(engn, runl) {
+                       if (fifo->chid || engn->engine == engine)
+                               return nvkm_runl_chan_get_chid(runl, id, pirqflags);
+               }
+       }
+
+       return NULL;
+}
+
 static const struct nvkm_object_func
 nvkm_fifo_chan_func = {
        .dtor = nvkm_fifo_chan_dtor,
 
 
        if (show) {
                nvkm_snprintbf(msg, sizeof(msg), runq->func->intr_0_names, show);
-               chan = nvkm_fifo_chan_chid(runq->fifo, chid, &flags);
+               chan = nvkm_chan_get_chid(&runq->fifo->engine, chid, &flags);
                nvkm_error(subdev, "PBDMA%d: %08x [%s] ch %d [%010llx %s] "
                                   "subc %d mthd %04x data %08x\n",
                           runq->id, show, msg, chid, chan ? chan->inst->addr : 0,
                           chan ? chan->object.client->name : "unknown",
                           subc, mthd, data);
-               nvkm_fifo_chan_put(runq->fifo, flags, &chan);
+               nvkm_chan_put(&chan, flags);
        }
 
        nvkm_wr32(device, 0x0400c0 + (runq->id * 0x2000), 0x80600008);
        struct nvkm_device *device = subdev->device;
        const struct nvkm_enum *er, *ee, *ec, *ea;
        struct nvkm_engine *engine = NULL;
-       struct nvkm_fifo_chan *chan;
        struct nvkm_runl *runl;
        struct nvkm_engn *engn;
+       struct nvkm_chan *chan;
        unsigned long flags;
        char ct[8] = "HUB/";
 
                }
        }
 
-       chan = nvkm_fifo_chan_inst(fifo, info->inst, &flags);
+       chan = nvkm_chan_get_inst(&fifo->engine, info->inst, &flags);
 
        nvkm_error(subdev,
                   "fault %02x [%s] at %016llx engine %02x [%s] client %02x "
        if (engine && chan)
                gf100_fifo_recover(gf100_fifo(fifo), engine, (void *)chan);
 
-       nvkm_fifo_chan_put(fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 }
 
 static const struct nvkm_fifo_func_mmu_fault
 
 #include "channv04.h"
 #include "regsnv04.h"
 
-#include <core/client.h>
 #include <core/ramht.h>
 #include <subdev/instmem.h>
 #include <subdev/mc.h>
 {
        struct nvkm_subdev *subdev = &fifo->engine.subdev;
        struct nvkm_device *device = subdev->device;
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        unsigned long flags;
        u32 pull0 = nvkm_rd32(device, 0x003250);
        u32 mthd, data;
 
        if (!(pull0 & 0x00000100) ||
            !nv04_fifo_swmthd(device, chid, mthd, data)) {
-               chan = nvkm_fifo_chan_chid(fifo, chid, &flags);
+               chan = nvkm_chan_get_chid(&fifo->engine, chid, &flags);
                nvkm_error(subdev, "CACHE_ERROR - "
                           "ch %d [%s] subc %d mthd %04x data %08x\n",
-                          chid, chan ? chan->object.client->name : "unknown",
+                          chid, chan ? chan->name : "unknown",
                           (mthd >> 13) & 7, mthd & 0x1ffc, data);
-               nvkm_fifo_chan_put(fifo, flags, &chan);
+               nvkm_chan_put(&chan, flags);
        }
 
        nvkm_wr32(device, NV04_PFIFO_CACHE1_DMA_PUSH, 0);
        u32 dma_put = nvkm_rd32(device, 0x003240);
        u32 push = nvkm_rd32(device, 0x003220);
        u32 state = nvkm_rd32(device, 0x003228);
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        unsigned long flags;
        const char *name;
 
-       chan = nvkm_fifo_chan_chid(fifo, chid, &flags);
-       name = chan ? chan->object.client->name : "unknown";
+       chan = nvkm_chan_get_chid(&fifo->engine, chid, &flags);
+       name = chan ? chan->name : "unknown";
        if (device->card_type == NV_50) {
                u32 ho_get = nvkm_rd32(device, 0x003328);
                u32 ho_put = nvkm_rd32(device, 0x003320);
                if (dma_get != dma_put)
                        nvkm_wr32(device, 0x003244, dma_put);
        }
-       nvkm_fifo_chan_put(fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 
        nvkm_wr32(device, 0x003228, 0x00000000);
        nvkm_wr32(device, 0x003220, 0x00000001);
 
 void nvkm_fifo_kevent(struct nvkm_fifo *, int chid);
 void nvkm_fifo_recover_chan(struct nvkm_fifo *, int chid);
 
-struct nvkm_fifo_chan *
-nvkm_fifo_chan_inst_locked(struct nvkm_fifo *, u64 inst);
-
 struct nvkm_fifo_chan_oclass;
 struct nvkm_fifo_func {
        void *(*dtor)(struct nvkm_fifo *);
 
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "runl.h"
+#include "cgrp.h"
 #include "chan.h"
 #include "chid.h"
 #include "priv.h"
 
+#include <core/gpuobj.h>
 #include <subdev/top.h>
 
+struct nvkm_chan *
+nvkm_runl_chan_get_inst(struct nvkm_runl *runl, u64 inst, unsigned long *pirqflags)
+{
+       struct nvkm_chid *chid = runl->chid;
+       struct nvkm_chan *chan;
+       unsigned long flags;
+       int id;
+
+       spin_lock_irqsave(&chid->lock, flags);
+       for_each_set_bit(id, chid->used, chid->nr) {
+               chan = chid->data[id];
+               if (likely(chan)) {
+                       if (chan->inst->addr == inst) {
+                               spin_lock(&chan->cgrp->lock);
+                               *pirqflags = flags;
+                               spin_unlock(&chid->lock);
+                               return chan;
+                       }
+               }
+       }
+       spin_unlock_irqrestore(&chid->lock, flags);
+       return NULL;
+}
+
+struct nvkm_chan *
+nvkm_runl_chan_get_chid(struct nvkm_runl *runl, int id, unsigned long *pirqflags)
+{
+       struct nvkm_chid *chid = runl->chid;
+       struct nvkm_chan *chan;
+       unsigned long flags;
+
+       spin_lock_irqsave(&chid->lock, flags);
+       if (!WARN_ON(id >= chid->nr)) {
+               chan = chid->data[id];
+               if (likely(chan)) {
+                       spin_lock(&chan->cgrp->lock);
+                       *pirqflags = flags;
+                       spin_unlock(&chid->lock);
+                       return chan;
+               }
+       }
+       spin_unlock_irqrestore(&chid->lock, flags);
+       return NULL;
+}
+
 void
 nvkm_runl_del(struct nvkm_runl *runl)
 {
 
                                enum nvkm_subdev_type, int inst);
 void nvkm_runl_del(struct nvkm_runl *);
 
+struct nvkm_chan *nvkm_runl_chan_get_chid(struct nvkm_runl *, int chid, unsigned long *irqflags);
+struct nvkm_chan *nvkm_runl_chan_get_inst(struct nvkm_runl *, u64 inst, unsigned long *irqflags);
+
 #define nvkm_runl_find_engn(engn,runl,cond) nvkm_list_find(engn, &(runl)->engns, head, (cond))
 
 #define nvkm_runl_foreach(runl,fifo) list_for_each_entry((runl), &(fifo)->runls, head)
 
        struct gf100_gr *gr = gf100_gr(base);
        struct nvkm_subdev *subdev = &gr->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        unsigned long flags;
        u64 inst = nvkm_rd32(device, 0x409b00) & 0x0fffffff;
        u32 stat = nvkm_rd32(device, 0x400100);
        const char *name = "unknown";
        int chid = -1;
 
-       chan = nvkm_fifo_chan_inst(device->fifo, (u64)inst << 12, &flags);
+       chan = nvkm_chan_get_inst(&gr->base.engine, (u64)inst << 12, &flags);
        if (chan) {
-               name = chan->object.client->name;
-               chid = chan->chid;
+               name = chan->name;
+               chid = chan->id;
        }
 
        if (device->card_type < NV_E0 || subc < 4)
        }
 
        nvkm_wr32(device, 0x400500, 0x00010001);
-       nvkm_fifo_chan_put(device->fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 }
 
 static void
 
                return -ENOMEM;
        nvkm_object_ctor(&nv04_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        *ctx_reg(chan, NV04_PGRAPH_DEBUG_3) = 0xfad4ff31;
 
                return -ENOMEM;
        nvkm_object_ctor(&nv10_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        NV_WRITE_CTX(0x00400e88, 0x08000000);
 
                return -ENOMEM;
        nvkm_object_ctor(&nv20_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        ret = nvkm_memory_new(gr->base.engine.subdev.device,
        struct nv20_gr *gr = nv20_gr(base);
        struct nvkm_subdev *subdev = &gr->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        u32 stat = nvkm_rd32(device, NV03_PGRAPH_INTR);
        u32 nsource = nvkm_rd32(device, NV03_PGRAPH_NSOURCE);
        u32 nstatus = nvkm_rd32(device, NV03_PGRAPH_NSTATUS);
        char msg[128], src[128], sta[128];
        unsigned long flags;
 
-       chan = nvkm_fifo_chan_chid(device->fifo, chid, &flags);
+       chan = nvkm_chan_get_chid(&gr->base.engine, chid, &flags);
 
        nvkm_wr32(device, NV03_PGRAPH_INTR, stat);
        nvkm_wr32(device, NV04_PGRAPH_FIFO, 0x00000001);
                                   "nstatus %08x [%s] ch %d [%s] subc %d "
                                   "class %04x mthd %04x data %08x\n",
                           show, msg, nsource, src, nstatus, sta, chid,
-                          chan ? chan->object.client->name : "unknown",
+                          chan ? chan->name : "unknown",
                           subc, class, mthd, data);
        }
 
-       nvkm_fifo_chan_put(device->fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 }
 
 int
 
                return -ENOMEM;
        nvkm_object_ctor(&nv25_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        ret = nvkm_memory_new(gr->base.engine.subdev.device,
 
                return -ENOMEM;
        nvkm_object_ctor(&nv2a_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        ret = nvkm_memory_new(gr->base.engine.subdev.device,
 
                return -ENOMEM;
        nvkm_object_ctor(&nv30_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        ret = nvkm_memory_new(gr->base.engine.subdev.device,
 
                return -ENOMEM;
        nvkm_object_ctor(&nv34_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        ret = nvkm_memory_new(gr->base.engine.subdev.device,
 
                return -ENOMEM;
        nvkm_object_ctor(&nv35_gr_chan, oclass, &chan->object);
        chan->gr = gr;
-       chan->chid = fifoch->chid;
+       chan->chid = fifoch->id;
        *pobject = &chan->object;
 
        ret = nvkm_memory_new(gr->base.engine.subdev.device,
 
                                   "nstatus %08x [%s] ch %d [%08x %s] subc %d "
                                   "class %04x mthd %04x data %08x\n",
                           show, msg, nsource, src, nstatus, sta,
-                          chan ? chan->fifo->chid : -1, inst << 4,
-                          chan ? chan->fifo->object.client->name : "unknown",
+                          chan ? chan->fifo->id : -1, inst << 4,
+                          chan ? chan->fifo->name : "unknown",
                           subc, class, mthd, data);
        }
 
 
        struct nv50_gr *gr = nv50_gr(base);
        struct nvkm_subdev *subdev = &gr->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        u32 stat = nvkm_rd32(device, 0x400100);
        u32 inst = nvkm_rd32(device, 0x40032c) & 0x0fffffff;
        u32 addr = nvkm_rd32(device, 0x400704);
        char msg[128];
        int chid = -1;
 
-       chan = nvkm_fifo_chan_inst(device->fifo, (u64)inst << 12, &flags);
+       chan = nvkm_chan_get_inst(&gr->base.engine, (u64)inst << 12, &flags);
        if (chan)  {
-               name = chan->object.client->name;
-               chid = chan->chid;
+               name = chan->name;
+               chid = chan->id;
        }
 
        if (show & 0x00100000) {
        if (nvkm_rd32(device, 0x400824) & (1 << 31))
                nvkm_wr32(device, 0x400824, nvkm_rd32(device, 0x400824) & ~(1 << 31));
 
-       nvkm_fifo_chan_put(device->fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 }
 
 int
 
 
        if (show) {
                nvkm_error(subdev, "ch %d [%s] %08x %08x %08x %08x\n",
-                          mpeg->chan ? mpeg->chan->fifo->chid : -1,
-                          mpeg->chan ? mpeg->chan->object.client->name :
+                          mpeg->chan ? mpeg->chan->fifo->id : -1,
+                          mpeg->chan ? mpeg->chan->fifo->name :
                           "unknown", stat, type, mthd, data);
        }
 
 
 
        if (show) {
                nvkm_error(subdev, "ch %d [%08x %s] %08x %08x %08x %08x\n",
-                          chan ? chan->fifo->chid : -1, inst << 4,
-                          chan ? chan->object.client->name : "unknown",
+                          chan ? chan->fifo->id : -1, inst << 4,
+                          chan ? chan->fifo->name : "unknown",
                           stat, type, mthd, data);
        }
 
 
 };
 
 static void
-g98_sec_intr(struct nvkm_falcon *sec, struct nvkm_fifo_chan *chan)
+g98_sec_intr(struct nvkm_falcon *sec, struct nvkm_chan *chan)
 {
        struct nvkm_subdev *subdev = &sec->engine.subdev;
        struct nvkm_device *device = subdev->device;
 
        nvkm_error(subdev, "DISPATCH_ERROR %04x [%s] ch %d [%010llx %s] "
                           "subc %d mthd %04x data %08x\n", ssta,
-                  en ? en->name : "UNKNOWN", chan ? chan->chid : -1,
+                  en ? en->name : "UNKNOWN", chan ? chan->id : -1,
                   chan ? chan->inst->addr : 0,
-                  chan ? chan->object.client->name : "unknown",
+                  chan ? chan->name : "unknown",
                   subc, mthd, data);
 }
 
 
 
        spin_lock_irqsave(&sw->engine.lock, flags);
        list_for_each_entry(chan, &sw->chan, head) {
-               if (chan->fifo->chid == chid) {
+               if (chan->fifo->id == chid) {
                        handled = nvkm_sw_chan_mthd(chan, subc, mthd, data);
                        list_del(&chan->head);
                        list_add(&chan->head, &sw->chan);
 
        struct nv50_fb *fb = nv50_fb(base);
        struct nvkm_subdev *subdev = &fb->base.subdev;
        struct nvkm_device *device = subdev->device;
-       struct nvkm_fifo *fifo = device->fifo;
-       struct nvkm_fifo_chan *chan;
+       struct nvkm_chan *chan;
        const struct nvkm_enum *en, *re, *cl, *sc;
        u32 trap[6], idx, inst;
        u8 st0, st1, st2, st3;
        else if (en && en->data) sc = nvkm_enum_find(en->data, st3);
        else                     sc = NULL;
 
-       chan = nvkm_fifo_chan_inst(fifo, inst, &flags);
+       chan = nvkm_chan_get_inst(&device->fifo->engine, inst, &flags);
        nvkm_error(subdev, "trapped %s at %02x%04x%04x on channel %d [%08x %s] "
                           "engine %02x [%s] client %02x [%s] "
                           "subclient %02x [%s] reason %08x [%s]\n",
                   (trap[5] & 0x00000100) ? "read" : "write",
                   trap[5] & 0xff, trap[4] & 0xffff, trap[3] & 0xffff,
-                  chan ? chan->chid : -1, inst,
-                  chan ? chan->object.client->name : "unknown",
+                  chan ? chan->id : -1, inst,
+                  chan ? chan->name : "unknown",
                   st0, en ? en->name : "",
                   st2, cl ? cl->name : "", st3, sc ? sc->name : "",
                   st1, re ? re->name : "");
-       nvkm_fifo_chan_put(fifo, flags, &chan);
+       nvkm_chan_put(&chan, flags);
 }
 
 static int