drm/nouveau/fifo: audit and version fifo channel classes

The full object interfaces are about to be exposed to userspace, so we
need to check for any security-related issues and version the structs
to make it easier to handle any changes we may need in the future.

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

19 files changed, 323 insertions, 199 deletions

diff --git a/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c b/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c
index a1e722ad31ad..3e14f46cfbd2 100644
--- a/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c
@@ -52,10 +52,10 @@ nv04_dmaobj_bind(struct nouveau_dmaobj *dmaobj,
 
         if (!nv_iclass(parent, NV_ENGCTX_CLASS)) {
                 switch (nv_mclass(parent->parent)) {
-                case NV03_CHANNEL_DMA_CLASS:
-                case NV10_CHANNEL_DMA_CLASS:
-                case NV17_CHANNEL_DMA_CLASS:
-                case NV40_CHANNEL_DMA_CLASS:
+                case NV03_CHANNEL_DMA:
+                case NV10_CHANNEL_DMA:
+                case NV17_CHANNEL_DMA:
+                case NV40_CHANNEL_DMA:
                         break;
                 default:
                         return -EINVAL;
diff --git a/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c b/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c
index 71387c4c55b1..7495f7d363bb 100644
--- a/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c
@@ -48,10 +48,9 @@ nv50_dmaobj_bind(struct nouveau_dmaobj *dmaobj,
 
         if (!nv_iclass(parent, NV_ENGCTX_CLASS)) {
                 switch (nv_mclass(parent->parent)) {
-                case NV50_CHANNEL_DMA_CLASS:
-                case NV84_CHANNEL_DMA_CLASS:
-                case NV50_CHANNEL_IND_CLASS:
-                case NV84_CHANNEL_IND_CLASS:
+                case NV40_CHANNEL_DMA:
+                case NV50_CHANNEL_GPFIFO:
+                case G82_CHANNEL_GPFIFO:
                 case NV50_DISP_MAST_CLASS:
                 case NV84_DISP_MAST_CLASS:
                 case NV94_DISP_MAST_CLASS:
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/base.c b/drivers/gpu/drm/nouveau/core/engine/fifo/base.c
index 4f0e3d1b6ffd..f825def16ffa 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/base.c
@@ -26,7 +26,8 @@
 #include <core/object.h>
 #include <core/handle.h>
 #include <core/event.h>
-#include <core/class.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 
 #include <engine/dmaobj.h>
 #include <engine/fifo.h>
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
index 921062c7e5e4..5b4a9a56d630 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
@@ -22,8 +22,9 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/os.h>
-#include <core/class.h>
+#include <core/client.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 #include <core/engctx.h>
 #include <core/namedb.h>
 #include <core/handle.h>
@@ -117,16 +118,23 @@ nv04_fifo_chan_ctor(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, void *data, u32 size,
                     struct nouveau_object **pobject)
 {
+        union {
+                struct nv03_channel_dma_v0 v0;
+        } *args = data;
         struct nv04_fifo_priv *priv = (void *)engine;
         struct nv04_fifo_chan *chan;
-        struct nv03_channel_dma_class *args = data;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel dma size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                                 "offset %016llx\n", args->v0.version,
+                         args->v0.pushbuf, args->v0.offset);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
-                                          0x10000, args->pushbuf,
+                                          0x10000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR), &chan);
@@ -134,13 +142,15 @@ nv04_fifo_chan_ctor(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->object_attach = nv04_fifo_object_attach;
         nv_parent(chan)->object_detach = nv04_fifo_object_detach;
         nv_parent(chan)->context_attach = nv04_fifo_context_attach;
         chan->ramfc = chan->base.chid * 32;
 
-        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->offset);
-        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->v0.offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->v0.offset);
         nv_wo32(priv->ramfc, chan->ramfc + 0x08, chan->base.pushgpu->addr >> 4);
         nv_wo32(priv->ramfc, chan->ramfc + 0x10,
                              NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES |
@@ -248,7 +258,7 @@ nv04_fifo_ofuncs = {
 
 static struct nouveau_oclass
 nv04_fifo_sclass[] = {
-        { NV03_CHANNEL_DMA_CLASS, &nv04_fifo_ofuncs },
+        { NV03_CHANNEL_DMA, &nv04_fifo_ofuncs },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
index 571a22aa1ae5..90713fdef662 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
@@ -22,8 +22,9 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/os.h>
-#include <core/class.h>
+#include <core/client.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
 
@@ -59,16 +60,23 @@ nv10_fifo_chan_ctor(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, void *data, u32 size,
                     struct nouveau_object **pobject)
 {
+        union {
+                struct nv03_channel_dma_v0 v0;
+        } *args = data;
         struct nv04_fifo_priv *priv = (void *)engine;
         struct nv04_fifo_chan *chan;
-        struct nv03_channel_dma_class *args = data;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel dma size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                                 "offset %016llx\n", args->v0.version,
+                         args->v0.pushbuf, args->v0.offset);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
-                                          0x10000, args->pushbuf,
+                                          0x10000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR), &chan);
@@ -76,13 +84,15 @@ nv10_fifo_chan_ctor(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->object_attach = nv04_fifo_object_attach;
         nv_parent(chan)->object_detach = nv04_fifo_object_detach;
         nv_parent(chan)->context_attach = nv04_fifo_context_attach;
         chan->ramfc = chan->base.chid * 32;
 
-        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->offset);
-        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->v0.offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->v0.offset);
         nv_wo32(priv->ramfc, chan->ramfc + 0x0c, chan->base.pushgpu->addr >> 4);
         nv_wo32(priv->ramfc, chan->ramfc + 0x14,
                              NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES |
@@ -106,7 +116,7 @@ nv10_fifo_ofuncs = {
 
 static struct nouveau_oclass
 nv10_fifo_sclass[] = {
-        { NV10_CHANNEL_DMA_CLASS, &nv10_fifo_ofuncs },
+        { NV10_CHANNEL_DMA, &nv10_fifo_ofuncs },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
index f25760209316..07b4b2d33bd2 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
@@ -22,8 +22,9 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/os.h>
-#include <core/class.h>
+#include <core/client.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
 
@@ -64,16 +65,23 @@ nv17_fifo_chan_ctor(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, void *data, u32 size,
                     struct nouveau_object **pobject)
 {
+        union {
+                struct nv03_channel_dma_v0 v0;
+        } *args = data;
         struct nv04_fifo_priv *priv = (void *)engine;
         struct nv04_fifo_chan *chan;
-        struct nv03_channel_dma_class *args = data;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel dma size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                                 "offset %016llx\n", args->v0.version,
+                         args->v0.pushbuf, args->v0.offset);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
-                                          0x10000, args->pushbuf,
+                                          0x10000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR) |
@@ -83,13 +91,15 @@ nv17_fifo_chan_ctor(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->object_attach = nv04_fifo_object_attach;
         nv_parent(chan)->object_detach = nv04_fifo_object_detach;
         nv_parent(chan)->context_attach = nv04_fifo_context_attach;
         chan->ramfc = chan->base.chid * 64;
 
-        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->offset);
-        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->v0.offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->v0.offset);
         nv_wo32(priv->ramfc, chan->ramfc + 0x0c, chan->base.pushgpu->addr >> 4);
         nv_wo32(priv->ramfc, chan->ramfc + 0x14,
                              NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES |
@@ -113,7 +123,7 @@ nv17_fifo_ofuncs = {
 
 static struct nouveau_oclass
 nv17_fifo_sclass[] = {
-        { NV17_CHANNEL_DMA_CLASS, &nv17_fifo_ofuncs },
+        { NV17_CHANNEL_DMA, &nv17_fifo_ofuncs },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
index 343487ed2238..0aa3a1387742 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
@@ -22,8 +22,9 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/os.h>
-#include <core/class.h>
+#include <core/client.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
 
@@ -182,16 +183,23 @@ nv40_fifo_chan_ctor(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, void *data, u32 size,
                     struct nouveau_object **pobject)
 {
+        union {
+                struct nv03_channel_dma_v0 v0;
+        } *args = data;
         struct nv04_fifo_priv *priv = (void *)engine;
         struct nv04_fifo_chan *chan;
-        struct nv03_channel_dma_class *args = data;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel dma size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                                 "offset %016llx\n", args->v0.version,
+                         args->v0.pushbuf, args->v0.offset);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                          0x1000, args->pushbuf,
+                                          0x1000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR) |
@@ -200,14 +208,16 @@ nv40_fifo_chan_ctor(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->context_attach = nv40_fifo_context_attach;
         nv_parent(chan)->context_detach = nv40_fifo_context_detach;
         nv_parent(chan)->object_attach = nv40_fifo_object_attach;
         nv_parent(chan)->object_detach = nv04_fifo_object_detach;
         chan->ramfc = chan->base.chid * 128;
 
-        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->offset);
-        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->v0.offset);
+        nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->v0.offset);
         nv_wo32(priv->ramfc, chan->ramfc + 0x0c, chan->base.pushgpu->addr >> 4);
         nv_wo32(priv->ramfc, chan->ramfc + 0x18, 0x30000000 |
                              NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES |
@@ -232,7 +242,7 @@ nv40_fifo_ofuncs = {
 
 static struct nouveau_oclass
 nv40_fifo_sclass[] = {
-        { NV40_CHANNEL_DMA_CLASS, &nv40_fifo_ofuncs },
+        { NV40_CHANNEL_DMA, &nv40_fifo_ofuncs },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
index e6352bd5b4ff..ffc74f1ea30f 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
@@ -25,7 +25,8 @@
 #include <core/client.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
-#include <core/class.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 
 #include <subdev/timer.h>
 #include <subdev/bar.h>
@@ -194,17 +195,24 @@ nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
                         struct nouveau_oclass *oclass, void *data, u32 size,
                         struct nouveau_object **pobject)
 {
+        union {
+                struct nv03_channel_dma_v0 v0;
+        } *args = data;
         struct nouveau_bar *bar = nouveau_bar(parent);
         struct nv50_fifo_base *base = (void *)parent;
         struct nv50_fifo_chan *chan;
-        struct nv03_channel_dma_class *args = data;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel dma size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                                 "offset %016llx\n", args->v0.version,
+                         args->v0.pushbuf, args->v0.offset);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                          0x2000, args->pushbuf,
+                                          0x2000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR) |
@@ -213,6 +221,8 @@ nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->context_attach = nv50_fifo_context_attach;
         nv_parent(chan)->context_detach = nv50_fifo_context_detach;
         nv_parent(chan)->object_attach = nv50_fifo_object_attach;
@@ -223,10 +233,10 @@ nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
-        nv_wo32(base->ramfc, 0x08, lower_32_bits(args->offset));
-        nv_wo32(base->ramfc, 0x0c, upper_32_bits(args->offset));
-        nv_wo32(base->ramfc, 0x10, lower_32_bits(args->offset));
-        nv_wo32(base->ramfc, 0x14, upper_32_bits(args->offset));
+        nv_wo32(base->ramfc, 0x08, lower_32_bits(args->v0.offset));
+        nv_wo32(base->ramfc, 0x0c, upper_32_bits(args->v0.offset));
+        nv_wo32(base->ramfc, 0x10, lower_32_bits(args->v0.offset));
+        nv_wo32(base->ramfc, 0x14, upper_32_bits(args->v0.offset));
         nv_wo32(base->ramfc, 0x3c, 0x003f6078);
         nv_wo32(base->ramfc, 0x44, 0x01003fff);
         nv_wo32(base->ramfc, 0x48, chan->base.pushgpu->node->offset >> 4);
@@ -247,18 +257,26 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
                         struct nouveau_oclass *oclass, void *data, u32 size,
                         struct nouveau_object **pobject)
 {
-        struct nv50_channel_ind_class *args = data;
+        union {
+                struct nv50_channel_gpfifo_v0 v0;
+        } *args = data;
         struct nouveau_bar *bar = nouveau_bar(parent);
         struct nv50_fifo_base *base = (void *)parent;
         struct nv50_fifo_chan *chan;
         u64 ioffset, ilength;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel gpfifo size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                                 "ioffset %016llx ilength %08x\n",
+                         args->v0.version, args->v0.pushbuf, args->v0.ioffset,
+                         args->v0.ilength);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                          0x2000, args->pushbuf,
+                                          0x2000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR) |
@@ -267,6 +285,8 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->context_attach = nv50_fifo_context_attach;
         nv_parent(chan)->context_detach = nv50_fifo_context_detach;
         nv_parent(chan)->object_attach = nv50_fifo_object_attach;
@@ -277,8 +297,8 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
-        ioffset = args->ioffset;
-        ilength = order_base_2(args->ilength / 8);
+        ioffset = args->v0.ioffset;
+        ilength = order_base_2(args->v0.ilength / 8);
 
         nv_wo32(base->ramfc, 0x3c, 0x403f6078);
         nv_wo32(base->ramfc, 0x44, 0x01003fff);
@@ -359,8 +379,8 @@ nv50_fifo_ofuncs_ind = {
 
 static struct nouveau_oclass
 nv50_fifo_sclass[] = {
-        { NV50_CHANNEL_DMA_CLASS, &nv50_fifo_ofuncs_dma },
-        { NV50_CHANNEL_IND_CLASS, &nv50_fifo_ofuncs_ind },
+        { NV50_CHANNEL_DMA, &nv50_fifo_ofuncs_dma },
+        { NV50_CHANNEL_GPFIFO, &nv50_fifo_ofuncs_ind },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
index 0bf844d6db8a..bb9017377889 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
@@ -27,7 +27,8 @@
 #include <core/engctx.h>
 #include <core/ramht.h>
 #include <core/event.h>
-#include <core/class.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 
 #include <subdev/timer.h>
 #include <subdev/bar.h>
@@ -160,17 +161,24 @@ nv84_fifo_chan_ctor_dma(struct nouveau_object *parent,
                         struct nouveau_oclass *oclass, void *data, u32 size,
                         struct nouveau_object **pobject)
 {
+        union {
+                struct nv03_channel_dma_v0 v0;
+        } *args = data;
         struct nouveau_bar *bar = nouveau_bar(parent);
         struct nv50_fifo_base *base = (void *)parent;
         struct nv50_fifo_chan *chan;
-        struct nv03_channel_dma_class *args = data;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel dma size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                                 "offset %016llx\n", args->v0.version,
+                         args->v0.pushbuf, args->v0.offset);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                          0x2000, args->pushbuf,
+                                          0x2000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR) |
@@ -186,6 +194,8 @@ nv84_fifo_chan_ctor_dma(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
                                &chan->ramht);
         if (ret)
@@ -196,10 +206,10 @@ nv84_fifo_chan_ctor_dma(struct nouveau_object *parent,
         nv_parent(chan)->object_attach = nv84_fifo_object_attach;
         nv_parent(chan)->object_detach = nv50_fifo_object_detach;
 
-        nv_wo32(base->ramfc, 0x08, lower_32_bits(args->offset));
-        nv_wo32(base->ramfc, 0x0c, upper_32_bits(args->offset));
-        nv_wo32(base->ramfc, 0x10, lower_32_bits(args->offset));
-        nv_wo32(base->ramfc, 0x14, upper_32_bits(args->offset));
+        nv_wo32(base->ramfc, 0x08, lower_32_bits(args->v0.offset));
+        nv_wo32(base->ramfc, 0x0c, upper_32_bits(args->v0.offset));
+        nv_wo32(base->ramfc, 0x10, lower_32_bits(args->v0.offset));
+        nv_wo32(base->ramfc, 0x14, upper_32_bits(args->v0.offset));
         nv_wo32(base->ramfc, 0x3c, 0x003f6078);
         nv_wo32(base->ramfc, 0x44, 0x01003fff);
         nv_wo32(base->ramfc, 0x48, chan->base.pushgpu->node->offset >> 4);
@@ -222,18 +232,26 @@ nv84_fifo_chan_ctor_ind(struct nouveau_object *parent,
                         struct nouveau_oclass *oclass, void *data, u32 size,
                         struct nouveau_object **pobject)
 {
+        union {
+                struct nv50_channel_gpfifo_v0 v0;
+        } *args = data;
         struct nouveau_bar *bar = nouveau_bar(parent);
         struct nv50_fifo_base *base = (void *)parent;
         struct nv50_fifo_chan *chan;
-        struct nv50_channel_ind_class *args = data;
         u64 ioffset, ilength;
         int ret;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel gpfifo size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                                 "ioffset %016llx ilength %08x\n",
+                         args->v0.version, args->v0.pushbuf, args->v0.ioffset,
+                         args->v0.ilength);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                          0x2000, args->pushbuf,
+                                          0x2000, args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_DMAOBJ) |
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR) |
@@ -249,6 +267,8 @@ nv84_fifo_chan_ctor_ind(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
                                &chan->ramht);
         if (ret)
@@ -259,8 +279,8 @@ nv84_fifo_chan_ctor_ind(struct nouveau_object *parent,
         nv_parent(chan)->object_attach = nv84_fifo_object_attach;
         nv_parent(chan)->object_detach = nv50_fifo_object_detach;
 
-        ioffset = args->ioffset;
-        ilength = order_base_2(args->ilength / 8);
+        ioffset = args->v0.ioffset;
+        ilength = order_base_2(args->v0.ilength / 8);
 
         nv_wo32(base->ramfc, 0x3c, 0x403f6078);
         nv_wo32(base->ramfc, 0x44, 0x01003fff);
@@ -320,8 +340,8 @@ nv84_fifo_ofuncs_ind = {
 
 static struct nouveau_oclass
 nv84_fifo_sclass[] = {
-        { NV84_CHANNEL_DMA_CLASS, &nv84_fifo_ofuncs_dma },
-        { NV84_CHANNEL_IND_CLASS, &nv84_fifo_ofuncs_ind },
+        { G82_CHANNEL_DMA, &nv84_fifo_ofuncs_dma },
+        { G82_CHANNEL_GPFIFO, &nv84_fifo_ofuncs_ind },
         {}
 };
 
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
index bd7bf3c65bc6..c4a1e1122c93 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
@@ -28,7 +28,8 @@
 #include <core/gpuobj.h>
 #include <core/engctx.h>
 #include <core/event.h>
-#include <core/class.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 #include <core/enum.h>
 
 #include <subdev/timer.h>
@@ -187,20 +188,28 @@ nvc0_fifo_chan_ctor(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, void *data, u32 size,
                     struct nouveau_object **pobject)
 {
+        union {
+                struct nv50_channel_gpfifo_v0 v0;
+        } *args = data;
         struct nouveau_bar *bar = nouveau_bar(parent);
         struct nvc0_fifo_priv *priv = (void *)engine;
         struct nvc0_fifo_base *base = (void *)parent;
         struct nvc0_fifo_chan *chan;
-        struct nv50_channel_ind_class *args = data;
         u64 usermem, ioffset, ilength;
         int ret, i;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel gpfifo size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                                 "ioffset %016llx ilength %08x\n",
+                         args->v0.version, args->v0.pushbuf, args->v0.ioffset,
+                         args->v0.ilength);
+        } else
+                return ret;
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 1,
                                           priv->user.bar.offset, 0x1000,
-                                          args->pushbuf,
+                                          args->v0.pushbuf,
                                           (1ULL << NVDEV_ENGINE_SW) |
                                           (1ULL << NVDEV_ENGINE_GR) |
                                           (1ULL << NVDEV_ENGINE_COPY0) |
@@ -212,12 +221,14 @@ nvc0_fifo_chan_ctor(struct nouveau_object *parent,
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->context_attach = nvc0_fifo_context_attach;
         nv_parent(chan)->context_detach = nvc0_fifo_context_detach;
 
         usermem = chan->base.chid * 0x1000;
-        ioffset = args->ioffset;
-        ilength = order_base_2(args->ilength / 8);
+        ioffset = args->v0.ioffset;
+        ilength = order_base_2(args->v0.ilength / 8);
 
         for (i = 0; i < 0x1000; i += 4)
                 nv_wo32(priv->user.mem, usermem + i, 0x00000000);
@@ -297,7 +308,7 @@ nvc0_fifo_ofuncs = {
 
 static struct nouveau_oclass
 nvc0_fifo_sclass[] = {
-        { NVC0_CHANNEL_IND_CLASS, &nvc0_fifo_ofuncs },
+        { FERMI_CHANNEL_GPFIFO, &nvc0_fifo_ofuncs },
         {}
 };
 
@@ -654,7 +665,7 @@ nvc0_fifo_intr_fault(struct nvc0_fifo_priv *priv, int unit)
         object = engctx;
         while (object) {
                 switch (nv_mclass(object)) {
-                case NVC0_CHANNEL_IND_CLASS:
+                case FERMI_CHANNEL_GPFIFO:
                         nvc0_fifo_recover(priv, engine, (void *)object);
                         break;
                 }
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 3e7f03dc822f..96b14b7873f1 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -28,7 +28,8 @@
 #include <core/gpuobj.h>
 #include <core/engctx.h>
 #include <core/event.h>
-#include <core/class.h>
+#include <nvif/unpack.h>
+#include <nvif/class.h>
 #include <core/enum.h>
 
 #include <subdev/timer.h>
@@ -216,46 +217,56 @@ nve0_fifo_chan_ctor(struct nouveau_object *parent,
                     struct nouveau_oclass *oclass, void *data, u32 size,
                     struct nouveau_object **pobject)
 {
+        union {
+                struct kepler_channel_gpfifo_a_v0 v0;
+        } *args = data;
         struct nouveau_bar *bar = nouveau_bar(parent);
         struct nve0_fifo_priv *priv = (void *)engine;
         struct nve0_fifo_base *base = (void *)parent;
         struct nve0_fifo_chan *chan;
-        struct nve0_channel_ind_class *args = data;
         u64 usermem, ioffset, ilength;
         int ret, i;
 
-        if (size < sizeof(*args))
-                return -EINVAL;
+        nv_ioctl(parent, "create channel gpfifo size %d\n", size);
+        if (nvif_unpack(args->v0, 0, 0, false)) {
+                nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                                 "ioffset %016llx ilength %08x engine %08x\n",
+                         args->v0.version, args->v0.pushbuf, args->v0.ioffset,
+                         args->v0.ilength, args->v0.engine);
+        } else
+                return ret;
 
         for (i = 0; i < FIFO_ENGINE_NR; i++) {
-                if (args->engine & (1 << i)) {
+                if (args->v0.engine & (1 << i)) {
                         if (nouveau_engine(parent, fifo_engine[i].subdev)) {
-                                args->engine = (1 << i);
+                                args->v0.engine = (1 << i);
                                 break;
                         }
                 }
         }
 
         if (i == FIFO_ENGINE_NR) {
-                nv_error(priv, "unsupported engines 0x%08x\n", args->engine);
+                nv_error(priv, "unsupported engines 0x%08x\n", args->v0.engine);
                 return -ENODEV;
         }
 
         ret = nouveau_fifo_channel_create(parent, engine, oclass, 1,
                                           priv->user.bar.offset, 0x200,
-                                          args->pushbuf,
+                                          args->v0.pushbuf,
                                           fifo_engine[i].mask, &chan);
         *pobject = nv_object(chan);
         if (ret)
                 return ret;
 
+        args->v0.chid = chan->base.chid;
+
         nv_parent(chan)->context_attach = nve0_fifo_context_attach;
         nv_parent(chan)->context_detach = nve0_fifo_context_detach;
         chan->engine = i;
 
         usermem = chan->base.chid * 0x200;
-        ioffset = args->ioffset;
-        ilength = order_base_2(args->ilength / 8);
+        ioffset = args->v0.ioffset;
+        ilength = order_base_2(args->v0.ilength / 8);
 
         for (i = 0; i < 0x200; i += 4)
                 nv_wo32(priv->user.mem, usermem + i, 0x00000000);
@@ -331,7 +342,7 @@ nve0_fifo_ofuncs = {
 
 static struct nouveau_oclass
 nve0_fifo_sclass[] = {
-        { NVE0_CHANNEL_IND_CLASS, &nve0_fifo_ofuncs },
+        { KEPLER_CHANNEL_GPFIFO_A, &nve0_fifo_ofuncs },
         {}
 };
 
@@ -769,7 +780,7 @@ nve0_fifo_intr_fault(struct nve0_fifo_priv *priv, int unit)
         object = engctx;
         while (object) {
                 switch (nv_mclass(object)) {
-                case NVE0_CHANNEL_IND_CLASS:
+                case KEPLER_CHANNEL_GPFIFO_A:
                         nve0_fifo_recover(priv, engine, (void *)object);
                         break;
                 }
diff --git a/drivers/gpu/drm/nouveau/core/include/core/class.h b/drivers/gpu/drm/nouveau/core/include/core/class.h
index 79de03bdff96..d3180e51ce62 100644
--- a/drivers/gpu/drm/nouveau/core/include/core/class.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/class.h
@@ -3,62 +3,6 @@
 
 #include <nvif/class.h>
 
-/* DMA FIFO channel classes
- *
- * 006b: NV03_CHANNEL_DMA
- * 006e: NV10_CHANNEL_DMA
- * 176e: NV17_CHANNEL_DMA
- * 406e: NV40_CHANNEL_DMA
- * 506e: NV50_CHANNEL_DMA
- * 826e: NV84_CHANNEL_DMA
- */
-#define NV03_CHANNEL_DMA_CLASS                                       0x0000006b
-#define NV10_CHANNEL_DMA_CLASS                                       0x0000006e
-#define NV17_CHANNEL_DMA_CLASS                                       0x0000176e
-#define NV40_CHANNEL_DMA_CLASS                                       0x0000406e
-#define NV50_CHANNEL_DMA_CLASS                                       0x0000506e
-#define NV84_CHANNEL_DMA_CLASS                                       0x0000826e
-
-struct nv03_channel_dma_class {
-        u32 pushbuf;
-        u32 pad0;
-        u64 offset;
-};
-
-/* Indirect FIFO channel classes
- *
- * 506f: NV50_CHANNEL_IND
- * 826f: NV84_CHANNEL_IND
- * 906f: NVC0_CHANNEL_IND
- * a06f: NVE0_CHANNEL_IND
- */
-
-#define NV50_CHANNEL_IND_CLASS                                       0x0000506f
-#define NV84_CHANNEL_IND_CLASS                                       0x0000826f
-#define NVC0_CHANNEL_IND_CLASS                                       0x0000906f
-#define NVE0_CHANNEL_IND_CLASS                                       0x0000a06f
-
-struct nv50_channel_ind_class {
-        u32 pushbuf;
-        u32 ilength;
-        u64 ioffset;
-};
-
-#define NVE0_CHANNEL_IND_ENGINE_GR                                   0x00000001
-#define NVE0_CHANNEL_IND_ENGINE_VP                                   0x00000002
-#define NVE0_CHANNEL_IND_ENGINE_PPP                                  0x00000004
-#define NVE0_CHANNEL_IND_ENGINE_BSP                                  0x00000008
-#define NVE0_CHANNEL_IND_ENGINE_CE0                                  0x00000010
-#define NVE0_CHANNEL_IND_ENGINE_CE1                                  0x00000020
-#define NVE0_CHANNEL_IND_ENGINE_ENC                                  0x00000040
-
-struct nve0_channel_ind_class {
-        u32 pushbuf;
-        u32 ilength;
-        u64 ioffset;
-        u32 engine;
-};
-
 /* 0046: NV04_DISP
  */
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 0325db93a7d5..43dfc3e83409 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -257,13 +257,13 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
         /* hack to allow channel engine type specification on kepler */
         if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) {
                 if (init->fb_ctxdma_handle != ~0)
-                        init->fb_ctxdma_handle = NVE0_CHANNEL_IND_ENGINE_GR;
+                        init->fb_ctxdma_handle = KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR;
                 else
                         init->fb_ctxdma_handle = init->tt_ctxdma_handle;
 
                 /* allow flips to be executed if this is a graphics channel */
                 init->tt_ctxdma_handle = 0;
-                if (init->fb_ctxdma_handle == NVE0_CHANNEL_IND_ENGINE_GR)
+                if (init->fb_ctxdma_handle == KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR)
                         init->tt_ctxdma_handle = 1;
         }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 5ce2110b31f3..ab2d9ff45a44 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -187,14 +187,18 @@ static int
 nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device,
                     u32 handle, u32 engine, struct nouveau_channel **pchan)
 {
-        static const u16 oclasses[] = { NVE0_CHANNEL_IND_CLASS,
-                                        NVC0_CHANNEL_IND_CLASS,
-                                        NV84_CHANNEL_IND_CLASS,
-                                        NV50_CHANNEL_IND_CLASS,
+        static const u16 oclasses[] = { KEPLER_CHANNEL_GPFIFO_A,
+                                        FERMI_CHANNEL_GPFIFO,
+                                        G82_CHANNEL_GPFIFO,
+                                        NV50_CHANNEL_GPFIFO,
                                         0 };
         const u16 *oclass = oclasses;
-        struct nve0_channel_ind_class args;
+        union {
+                struct nv50_channel_gpfifo_v0 nv50;
+                struct kepler_channel_gpfifo_a_v0 kepler;
+        } args, *retn;
         struct nouveau_channel *chan;
+        u32 size;
         int ret;
 
         /* allocate dma push buffer */
@@ -204,16 +208,32 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device,
                 return ret;
 
         /* create channel object */
-        args.pushbuf = chan->push.ctxdma.handle;
-        args.ioffset = 0x10000 + chan->push.vma.offset;
-        args.ilength = 0x02000;
-        args.engine  = engine;
-
         do {
+                if (oclass[0] >= KEPLER_CHANNEL_GPFIFO_A) {
+                        args.kepler.version = 0;
+                        args.kepler.engine  = engine;
+                        args.kepler.pushbuf = chan->push.ctxdma.handle;
+                        args.kepler.ilength = 0x02000;
+                        args.kepler.ioffset = 0x10000 + chan->push.vma.offset;
+                        size = sizeof(args.kepler);
+                } else {
+                        args.nv50.version = 0;
+                        args.nv50.pushbuf = chan->push.ctxdma.handle;
+                        args.nv50.ilength = 0x02000;
+                        args.nv50.ioffset = 0x10000 + chan->push.vma.offset;
+                        size = sizeof(args.nv50);
+                }
+
                 ret = nvif_object_new(nvif_object(device), handle, *oclass++,
-                                     &args, sizeof(args), &chan->object);
-                if (ret == 0)
+                                      &args, size, &chan->object);
+                if (ret == 0) {
+                        retn = chan->object->data;
+                        if (chan->object->oclass >= KEPLER_CHANNEL_GPFIFO_A)
+                                chan->chid = retn->kepler.chid;
+                        else
+                                chan->chid = retn->nv50.chid;
                         return ret;
+                }
         } while (*oclass);
 
         nouveau_channel_del(pchan);
@@ -224,13 +244,13 @@ static int
 nouveau_channel_dma(struct nouveau_drm *drm, struct nvif_device *device,
                     u32 handle, struct nouveau_channel **pchan)
 {
-        static const u16 oclasses[] = { NV40_CHANNEL_DMA_CLASS,
-                                        NV17_CHANNEL_DMA_CLASS,
-                                        NV10_CHANNEL_DMA_CLASS,
-                                        NV03_CHANNEL_DMA_CLASS,
+        static const u16 oclasses[] = { NV40_CHANNEL_DMA,
+                                        NV17_CHANNEL_DMA,
+                                        NV10_CHANNEL_DMA,
+                                        NV03_CHANNEL_DMA,
                                         0 };
         const u16 *oclass = oclasses;
-        struct nv03_channel_dma_class args;
+        struct nv03_channel_dma_v0 args, *retn;
         struct nouveau_channel *chan;
         int ret;
 
@@ -241,14 +261,18 @@ nouveau_channel_dma(struct nouveau_drm *drm, struct nvif_device *device,
                 return ret;
 
         /* create channel object */
+        args.version = 0;
         args.pushbuf = chan->push.ctxdma.handle;
         args.offset = chan->push.vma.offset;
 
         do {
                 ret = nvif_object_new(nvif_object(device), handle, *oclass++,
-                                     &args, sizeof(args), &chan->object);
-                if (ret == 0)
+                                      &args, sizeof(args), &chan->object);
+                if (ret == 0) {
+                        retn = chan->object->data;
+                        chan->chid = retn->chid;
                         return ret;
+                }
         } while (ret && *oclass);
 
         nouveau_channel_del(pchan);
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h b/drivers/gpu/drm/nouveau/nouveau_chan.h
index 2a02fd56cf18..20163709d608 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.h
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.h
@@ -8,6 +8,8 @@ struct nouveau_channel {
         struct nvif_device *device;
         struct nouveau_drm *drm;
 
+        int chid;
+
         struct nvif_object vram;
         struct nvif_object gart;
         struct nvif_object nvsw;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 44f168c356ca..f11b65195337 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -156,24 +156,24 @@ nouveau_accel_init(struct nouveau_drm *drm)
 
         for (ret = -ENOSYS, i = 0; ret && i < ARRAY_SIZE(sclass); i++) {
                 switch (sclass[i]) {
-                case NV03_CHANNEL_DMA_CLASS:
+                case NV03_CHANNEL_DMA:
                         ret = nv04_fence_create(drm);
                         break;
-                case NV10_CHANNEL_DMA_CLASS:
+                case NV10_CHANNEL_DMA:
                         ret = nv10_fence_create(drm);
                         break;
-                case NV17_CHANNEL_DMA_CLASS:
-                case NV40_CHANNEL_DMA_CLASS:
+                case NV17_CHANNEL_DMA:
+                case NV40_CHANNEL_DMA:
                         ret = nv17_fence_create(drm);
                         break;
-                case NV50_CHANNEL_IND_CLASS:
+                case NV50_CHANNEL_GPFIFO:
                         ret = nv50_fence_create(drm);
                         break;
-                case NV84_CHANNEL_IND_CLASS:
+                case G82_CHANNEL_GPFIFO:
                         ret = nv84_fence_create(drm);
                         break;
-                case NVC0_CHANNEL_IND_CLASS:
-                case NVE0_CHANNEL_IND_CLASS:
+                case FERMI_CHANNEL_GPFIFO:
+                case KEPLER_CHANNEL_GPFIFO_A:
                         ret = nvc0_fence_create(drm);
                         break;
                 default:
@@ -189,13 +189,13 @@ nouveau_accel_init(struct nouveau_drm *drm)
 
         if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) {
                 ret = nouveau_channel_new(drm, &drm->device, NVDRM_CHAN + 1,
-                                          NVE0_CHANNEL_IND_ENGINE_CE0 |
-                                          NVE0_CHANNEL_IND_ENGINE_CE1, 0,
-                                          &drm->cechan);
+                                          KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE0|
+                                          KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE1,
+                                          0, &drm->cechan);
                 if (ret)
                         NV_ERROR(drm, "failed to create ce channel, %d\n", ret);
 
-                arg0 = NVE0_CHANNEL_IND_ENGINE_GR;
+                arg0 = KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR;
                 arg1 = 1;
         } else
         if (device->info.chipset >= 0xa3 &&
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 5e033b603806..4f50add8e6dd 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -410,7 +410,7 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb,
         if (unlikely(push == NULL))
                 return -EBUSY;
 
-        if (chan && chan->object->oclass < NV84_CHANNEL_IND_CLASS) {
+        if (chan && chan->object->oclass < G82_CHANNEL_GPFIFO) {
                 ret = RING_SPACE(chan, 8);
                 if (ret)
                         return ret;
@@ -424,7 +424,7 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb,
                 OUT_RING  (chan, sync->addr);
                 OUT_RING  (chan, sync->data);
         } else
-        if (chan && chan->object->oclass < NVC0_CHANNEL_IND_CLASS) {
+        if (chan && chan->object->oclass < FERMI_CHANNEL_GPFIFO) {
                 u64 addr = nv84_fence_crtc(chan, nv_crtc->index) + sync->addr;
                 ret = RING_SPACE(chan, 12);
                 if (ret)
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c
index c40fb29f9ea8..933a779c93ab 100644
--- a/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c
@@ -75,8 +75,7 @@ nv84_fence_emit(struct nouveau_fence *fence)
 {
         struct nouveau_channel *chan = fence->channel;
         struct nv84_fence_chan *fctx = chan->fence;
-        struct nouveau_fifo_chan *fifo = nvkm_fifo_chan(chan);
-        u64 addr = fifo->chid * 16;
+        u64 addr = chan->chid * 16;
 
         if (fence->sysmem)
                 addr += fctx->vma_gart.offset;
@@ -91,8 +90,7 @@ nv84_fence_sync(struct nouveau_fence *fence,
                 struct nouveau_channel *prev, struct nouveau_channel *chan)
 {
         struct nv84_fence_chan *fctx = chan->fence;
-        struct nouveau_fifo_chan *fifo = nvkm_fifo_chan(prev);
-        u64 addr = fifo->chid * 16;
+        u64 addr = prev->chid * 16;
 
         if (fence->sysmem)
                 addr += fctx->vma_gart.offset;
@@ -105,9 +103,8 @@ nv84_fence_sync(struct nouveau_fence *fence,
 static u32
 nv84_fence_read(struct nouveau_channel *chan)
 {
-        struct nouveau_fifo_chan *fifo = nvkm_fifo_chan(chan);
         struct nv84_fence_priv *priv = chan->drm->fence;
-        return nouveau_bo_rd32(priv->bo, fifo->chid * 16/4);
+        return nouveau_bo_rd32(priv->bo, chan->chid * 16/4);
 }
 
 static void
@@ -133,7 +130,6 @@ nv84_fence_context_del(struct nouveau_channel *chan)
 int
 nv84_fence_context_new(struct nouveau_channel *chan)
 {
-        struct nouveau_fifo_chan *fifo = nvkm_fifo_chan(chan);
         struct nouveau_cli *cli = (void *)nvif_client(&chan->device->base);
         struct nv84_fence_priv *priv = chan->drm->fence;
         struct nv84_fence_chan *fctx;
@@ -162,7 +158,7 @@ nv84_fence_context_new(struct nouveau_channel *chan)
                 ret = nouveau_bo_vma_add(bo, cli->vm, &fctx->dispc_vma[i]);
         }
 
-        nouveau_bo_wr32(priv->bo, fifo->chid * 16/4, 0x00000000);
+        nouveau_bo_wr32(priv->bo, chan->chid * 16/4, 0x00000000);
 
         if (ret)
                 nv84_fence_context_del(chan);
diff --git a/drivers/gpu/drm/nouveau/nvif/class.h b/drivers/gpu/drm/nouveau/nvif/class.h
index 7d6c13026855..476d57a1ed6e 100644
--- a/drivers/gpu/drm/nouveau/nvif/class.h
+++ b/drivers/gpu/drm/nouveau/nvif/class.h
@@ -12,6 +12,18 @@
 #define NV_DMA_TO_MEMORY                                             0x00000003
 #define NV_DMA_IN_MEMORY                                             0x0000003d
 
+#define NV03_CHANNEL_DMA                                             0x0000006b
+#define NV10_CHANNEL_DMA                                             0x0000006e
+#define NV17_CHANNEL_DMA                                             0x0000176e
+#define NV40_CHANNEL_DMA                                             0x0000406e
+#define NV50_CHANNEL_DMA                                             0x0000506e
+#define G82_CHANNEL_DMA                                              0x0000826e
+
+#define NV50_CHANNEL_GPFIFO                                          0x0000506f
+#define G82_CHANNEL_GPFIFO                                           0x0000826f
+#define FERMI_CHANNEL_GPFIFO                                         0x0000906f
+#define KEPLER_CHANNEL_GPFIFO_A                                      0x0000a06f
+
 
 /*******************************************************************************
  * client
@@ -233,4 +245,48 @@ struct nvif_control_pstate_user_v0 {
         __u8  pad03[5];
 };
 
+
+/*******************************************************************************
+ * DMA FIFO channels
+ ******************************************************************************/
+
+struct nv03_channel_dma_v0 {
+        __u8  version;
+        __u8  chid;
+        __u8  pad02[2];
+        __u32 pushbuf;
+        __u64 offset;
+};
+
+
+/*******************************************************************************
+ * GPFIFO channels
+ ******************************************************************************/
+
+struct nv50_channel_gpfifo_v0 {
+        __u8  version;
+        __u8  chid;
+        __u8  pad01[6];
+        __u32 pushbuf;
+        __u32 ilength;
+        __u64 ioffset;
+};
+
+struct kepler_channel_gpfifo_a_v0 {
+        __u8  version;
+#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR                               0x01
+#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_VP                               0x02
+#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_PPP                              0x04
+#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_BSP                              0x08
+#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE0                              0x10
+#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE1                              0x20
+#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_ENC                              0x40
+        __u8  engine;
+        __u16 chid;
+        __u8  pad04[4];
+        __u32 pushbuf;
+        __u32 ilength;
+        __u64 ioffset;
+};
+
 #endif