drm/nouveau: port all engines to new engine module format
[deliverable/linux.git] / drivers / gpu / drm / nouveau / core / engine / fifo / nv50.c
index 7b5b1592bf619c1d90ae27e39794c574d9b17b4a..4914c3b94413f746a605ff51fdf8219416e25c71 100644 (file)
 /*
- * Copyright (C) 2012 Ben Skeggs.
- * All Rights Reserved.
+ * Copyright 2012 Red Hat Inc.
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  *
+ * Authors: Ben Skeggs
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "nouveau_drv.h"
-#include <engine/fifo.h>
+#include <core/client.h>
+#include <core/engctx.h>
 #include <core/ramht.h>
+#include <core/class.h>
+#include <core/math.h>
 
-struct nv50_fifo_priv {
-       struct nouveau_fifo_priv base;
-       struct nouveau_gpuobj *playlist[2];
-       int cur_playlist;
-};
+#include <subdev/timer.h>
+#include <subdev/bar.h>
 
-struct nv50_fifo_chan {
-       struct nouveau_fifo_chan base;
-};
+#include <engine/dmaobj.h>
+#include <engine/fifo.h>
+
+#include "nv50.h"
+
+/*******************************************************************************
+ * FIFO channel objects
+ ******************************************************************************/
 
 void
-nv50_fifo_playlist_update(struct drm_device *dev)
+nv50_fifo_playlist_update(struct nv50_fifo_priv *priv)
 {
-       struct nv50_fifo_priv *priv = nv_engine(dev, NVOBJ_ENGINE_FIFO);
+       struct nouveau_bar *bar = nouveau_bar(priv);
        struct nouveau_gpuobj *cur;
        int i, p;
 
        cur = priv->playlist[priv->cur_playlist];
        priv->cur_playlist = !priv->cur_playlist;
 
-       for (i = 0, p = 0; i < priv->base.channels; i++) {
-               if (nv_rd32(dev, 0x002600 + (i * 4)) & 0x80000000)
+       for (i = priv->base.min, p = 0; i < priv->base.max; i++) {
+               if (nv_rd32(priv, 0x002600 + (i * 4)) & 0x80000000)
                        nv_wo32(cur, p++ * 4, i);
        }
 
-       nvimem_flush(dev);
+       bar->flush(bar);
 
-       nv_wr32(dev, 0x0032f4, cur->addr >> 12);
-       nv_wr32(dev, 0x0032ec, p);
-       nv_wr32(dev, 0x002500, 0x00000101);
+       nv_wr32(priv, 0x0032f4, cur->addr >> 12);
+       nv_wr32(priv, 0x0032ec, p);
+       nv_wr32(priv, 0x002500, 0x00000101);
 }
 
 static int
-nv50_fifo_context_new(struct nouveau_channel *chan, int engine)
+nv50_fifo_context_attach(struct nouveau_object *parent,
+                        struct nouveau_object *object)
 {
-       struct nv50_fifo_priv *priv = nv_engine(chan->dev, engine);
-       struct nv50_fifo_chan *fctx;
-       struct drm_device *dev = chan->dev;
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       u64 ib_offset = chan->pushbuf_base + chan->dma.ib_base * 4;
-       u64 instance = chan->ramin->addr >> 12;
-       unsigned long flags;
-       int ret = 0, i;
-
-       fctx = chan->engctx[engine] = kzalloc(sizeof(*fctx), GFP_KERNEL);
-       if (!fctx)
-               return -ENOMEM;
-       nvvm_engref(chan->vm, engine, 1);
-
-       chan->user = ioremap(pci_resource_start(dev->pdev, 0) +
-                            NV50_USER(chan->id), PAGE_SIZE);
-       if (!chan->user) {
-               ret = -ENOMEM;
-               goto error;
+       struct nouveau_bar *bar = nouveau_bar(parent);
+       struct nv50_fifo_base *base = (void *)parent->parent;
+       struct nouveau_gpuobj *ectx = (void *)object;
+       u64 limit = ectx->addr + ectx->size - 1;
+       u64 start = ectx->addr;
+       u32 addr;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW   : return 0;
+       case NVDEV_ENGINE_GR   : addr = 0x0000; break;
+       case NVDEV_ENGINE_MPEG : addr = 0x0060; break;
+       default:
+               return -EINVAL;
        }
 
-       for (i = 0; i < 0x100; i += 4)
-               nv_wo32(chan->ramin, i, 0x00000000);
-       nv_wo32(chan->ramin, 0x3c, 0x403f6078);
-       nv_wo32(chan->ramin, 0x40, 0x00000000);
-       nv_wo32(chan->ramin, 0x44, 0x01003fff);
-       nv_wo32(chan->ramin, 0x48, chan->pushbuf->node->offset >> 4);
-       nv_wo32(chan->ramin, 0x50, lower_32_bits(ib_offset));
-       nv_wo32(chan->ramin, 0x54, upper_32_bits(ib_offset) |
-                                  drm_order(chan->dma.ib_max + 1) << 16);
-       nv_wo32(chan->ramin, 0x60, 0x7fffffff);
-       nv_wo32(chan->ramin, 0x78, 0x00000000);
-       nv_wo32(chan->ramin, 0x7c, 0x30000001);
-       nv_wo32(chan->ramin, 0x80, ((chan->ramht->bits - 9) << 27) |
-                                  (4 << 24) /* SEARCH_FULL */ |
-                                  (chan->ramht->gpuobj->node->offset >> 4));
-
-       nvimem_flush(dev);
-
-       spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
-       nv_wr32(dev, 0x002600 + (chan->id * 4), 0x80000000 | instance);
-       nv50_fifo_playlist_update(dev);
-       spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
-
-error:
-       if (ret)
-               priv->base.base.context_del(chan, engine);
-       return ret;
+       nv_wo32(base->eng, addr + 0x00, 0x00190000);
+       nv_wo32(base->eng, addr + 0x04, lower_32_bits(limit));
+       nv_wo32(base->eng, addr + 0x08, lower_32_bits(start));
+       nv_wo32(base->eng, addr + 0x0c, upper_32_bits(limit) << 24 |
+                                       upper_32_bits(start));
+       nv_wo32(base->eng, addr + 0x10, 0x00000000);
+       nv_wo32(base->eng, addr + 0x14, 0x00000000);
+       bar->flush(bar);
+       return 0;
 }
 
-static bool
-nv50_fifo_kickoff(struct nouveau_channel *chan)
+static int
+nv50_fifo_context_detach(struct nouveau_object *parent, bool suspend,
+                        struct nouveau_object *object)
 {
-       struct drm_device *dev = chan->dev;
-       bool done = true;
-       u32 me;
+       struct nouveau_bar *bar = nouveau_bar(parent);
+       struct nv50_fifo_priv *priv = (void *)parent->engine;
+       struct nv50_fifo_base *base = (void *)parent->parent;
+       struct nv50_fifo_chan *chan = (void *)parent;
+       u32 addr, me;
+       int ret = 0;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW   : return 0;
+       case NVDEV_ENGINE_GR   : addr = 0x0000; break;
+       case NVDEV_ENGINE_MPEG : addr = 0x0060; break;
+       default:
+               return -EINVAL;
+       }
+
+       nv_wo32(base->eng, addr + 0x00, 0x00000000);
+       nv_wo32(base->eng, addr + 0x04, 0x00000000);
+       nv_wo32(base->eng, addr + 0x08, 0x00000000);
+       nv_wo32(base->eng, addr + 0x0c, 0x00000000);
+       nv_wo32(base->eng, addr + 0x10, 0x00000000);
+       nv_wo32(base->eng, addr + 0x14, 0x00000000);
+       bar->flush(bar);
 
        /* HW bug workaround:
         *
@@ -134,159 +131,308 @@ nv50_fifo_kickoff(struct nouveau_channel *chan)
         * there's also a "ignore these engines" bitmask reg we can use
         * if we hit the issue there..
         */
-
-       /* PME: make sure engine is enabled */
-       me = nv_mask(dev, 0x00b860, 0x00000001, 0x00000001);
+       me = nv_mask(priv, 0x00b860, 0x00000001, 0x00000001);
 
        /* do the kickoff... */
-       nv_wr32(dev, 0x0032fc, chan->ramin->addr >> 12);
-       if (!nv_wait_ne(dev, 0x0032fc, 0xffffffff, 0xffffffff)) {
-               NV_INFO(dev, "PFIFO: channel %d unload timeout\n", chan->id);
-               done = false;
+       nv_wr32(priv, 0x0032fc, nv_gpuobj(base)->addr >> 12);
+       if (!nv_wait_ne(priv, 0x0032fc, 0xffffffff, 0xffffffff)) {
+               nv_error(priv, "channel %d unload timeout\n", chan->base.chid);
+               if (suspend)
+                       ret = -EBUSY;
        }
 
-       /* restore any engine states we changed, and exit */
-       nv_wr32(dev, 0x00b860, me);
-       return done;
+       nv_wr32(priv, 0x00b860, me);
+       return ret;
 }
 
-static void
-nv50_fifo_context_del(struct nouveau_channel *chan, int engine)
+static int
+nv50_fifo_object_attach(struct nouveau_object *parent,
+                       struct nouveau_object *object, u32 handle)
 {
-       struct nv50_fifo_chan *fctx = chan->engctx[engine];
-       struct drm_device *dev = chan->dev;
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       unsigned long flags;
-
-       /* remove channel from playlist, will context switch if active */
-       spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
-       nv_mask(dev, 0x002600 + (chan->id * 4), 0x80000000, 0x00000000);
-       nv50_fifo_playlist_update(dev);
-
-       /* tell any engines on this channel to unload their contexts */
-       nv50_fifo_kickoff(chan);
-
-       nv_wr32(dev, 0x002600 + (chan->id * 4), 0x00000000);
-       spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
-
-       /* clean up */
-       if (chan->user) {
-               iounmap(chan->user);
-               chan->user = NULL;
+       struct nv50_fifo_chan *chan = (void *)parent;
+       u32 context;
+
+       if (nv_iclass(object, NV_GPUOBJ_CLASS))
+               context = nv_gpuobj(object)->node->offset >> 4;
+       else
+               context = 0x00000004; /* just non-zero */
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_DMAOBJ:
+       case NVDEV_ENGINE_SW    : context |= 0x00000000; break;
+       case NVDEV_ENGINE_GR    : context |= 0x00100000; break;
+       case NVDEV_ENGINE_MPEG  : context |= 0x00200000; break;
+       default:
+               return -EINVAL;
        }
 
-       nvvm_engref(chan->vm, engine, -1);
-       chan->engctx[engine] = NULL;
-       kfree(fctx);
+       return nouveau_ramht_insert(chan->ramht, 0, handle, context);
+}
+
+void
+nv50_fifo_object_detach(struct nouveau_object *parent, int cookie)
+{
+       struct nv50_fifo_chan *chan = (void *)parent;
+       nouveau_ramht_remove(chan->ramht, cookie);
 }
 
 static int
-nv50_fifo_init(struct drm_device *dev, int engine)
+nv50_fifo_chan_ctor(struct nouveau_object *parent,
+                   struct nouveau_object *engine,
+                   struct nouveau_oclass *oclass, void *data, u32 size,
+                   struct nouveau_object **pobject)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       u32 instance;
-       int i;
-
-       nv_mask(dev, 0x000200, 0x00000100, 0x00000000);
-       nv_mask(dev, 0x000200, 0x00000100, 0x00000100);
-       nv_wr32(dev, 0x00250c, 0x6f3cfc34);
-       nv_wr32(dev, 0x002044, 0x01003fff);
-
-       nv_wr32(dev, 0x002100, 0xffffffff);
-       nv_wr32(dev, 0x002140, 0xffffffff);
-
-       for (i = 0; i < 128; i++) {
-               struct nouveau_channel *chan = dev_priv->channels.ptr[i];
-               if (chan && chan->engctx[engine])
-                       instance = 0x80000000 | chan->ramin->addr >> 12;
-               else
-                       instance = 0x00000000;
-               nv_wr32(dev, 0x002600 + (i * 4), instance);
-       }
+       struct nv_channel_ind_class *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;
+
+       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
+                                         0x2000, args->pushbuf,
+                                         (1 << NVDEV_ENGINE_DMAOBJ) |
+                                         (1 << NVDEV_ENGINE_SW) |
+                                         (1 << NVDEV_ENGINE_GR) |
+                                         (1 << NVDEV_ENGINE_MPEG), &chan);
+       *pobject = nv_object(chan);
+       if (ret)
+               return ret;
 
-       nv50_fifo_playlist_update(dev);
+       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;
+       nv_parent(chan)->object_detach = nv50_fifo_object_detach;
 
-       nv_wr32(dev, 0x003200, 1);
-       nv_wr32(dev, 0x003250, 1);
-       nv_wr32(dev, 0x002500, 1);
+       ret = nouveau_ramht_new(parent, parent, 0x8000, 16, &chan->ramht);
+       if (ret)
+               return ret;
+
+       ioffset = args->ioffset;
+       ilength = log2i(args->ilength / 8);
+
+       nv_wo32(base->ramfc, 0x3c, 0x403f6078);
+       nv_wo32(base->ramfc, 0x44, 0x01003fff);
+       nv_wo32(base->ramfc, 0x48, chan->base.pushgpu->node->offset >> 4);
+       nv_wo32(base->ramfc, 0x50, lower_32_bits(ioffset));
+       nv_wo32(base->ramfc, 0x54, upper_32_bits(ioffset) | (ilength << 16));
+       nv_wo32(base->ramfc, 0x60, 0x7fffffff);
+       nv_wo32(base->ramfc, 0x78, 0x00000000);
+       nv_wo32(base->ramfc, 0x7c, 0x30000001);
+       nv_wo32(base->ramfc, 0x80, ((chan->ramht->bits - 9) << 27) |
+                                  (4 << 24) /* SEARCH_FULL */ |
+                                  (chan->ramht->base.node->offset >> 4));
+       bar->flush(bar);
        return 0;
 }
 
+void
+nv50_fifo_chan_dtor(struct nouveau_object *object)
+{
+       struct nv50_fifo_chan *chan = (void *)object;
+       nouveau_ramht_ref(NULL, &chan->ramht);
+       nouveau_fifo_channel_destroy(&chan->base);
+}
+
 static int
-nv50_fifo_fini(struct drm_device *dev, int engine, bool suspend)
+nv50_fifo_chan_init(struct nouveau_object *object)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nv50_fifo_priv *priv = nv_engine(dev, engine);
-       int i;
-
-       /* set playlist length to zero, fifo will unload context */
-       nv_wr32(dev, 0x0032ec, 0);
-
-       /* tell all connected engines to unload their contexts */
-       for (i = 0; i < priv->base.channels; i++) {
-               struct nouveau_channel *chan = dev_priv->channels.ptr[i];
-               if (chan && !nv50_fifo_kickoff(chan))
-                       return -EBUSY;
-       }
+       struct nv50_fifo_priv *priv = (void *)object->engine;
+       struct nv50_fifo_base *base = (void *)object->parent;
+       struct nv50_fifo_chan *chan = (void *)object;
+       struct nouveau_gpuobj *ramfc = base->ramfc;
+       u32 chid = chan->base.chid;
+       int ret;
 
-       nv_wr32(dev, 0x002140, 0);
+       ret = nouveau_fifo_channel_init(&chan->base);
+       if (ret)
+               return ret;
+
+       nv_wr32(priv, 0x002600 + (chid * 4), 0x80000000 | ramfc->addr >> 12);
+       nv50_fifo_playlist_update(priv);
        return 0;
 }
 
-void
-nv50_fifo_tlb_flush(struct drm_device *dev, int engine)
+int
+nv50_fifo_chan_fini(struct nouveau_object *object, bool suspend)
 {
-       nv50_vm_flush_engine(dev, 5);
+       struct nv50_fifo_priv *priv = (void *)object->engine;
+       struct nv50_fifo_chan *chan = (void *)object;
+       u32 chid = chan->base.chid;
+
+       /* remove channel from playlist, fifo will unload context */
+       nv_mask(priv, 0x002600 + (chid * 4), 0x80000000, 0x00000000);
+       nv50_fifo_playlist_update(priv);
+       nv_wr32(priv, 0x002600 + (chid * 4), 0x00000000);
+
+       return nouveau_fifo_channel_fini(&chan->base, suspend);
 }
 
-void
-nv50_fifo_destroy(struct drm_device *dev, int engine)
+static struct nouveau_ofuncs
+nv50_fifo_ofuncs = {
+       .ctor = nv50_fifo_chan_ctor,
+       .dtor = nv50_fifo_chan_dtor,
+       .init = nv50_fifo_chan_init,
+       .fini = nv50_fifo_chan_fini,
+       .rd32 = _nouveau_fifo_channel_rd32,
+       .wr32 = _nouveau_fifo_channel_wr32,
+};
+
+static struct nouveau_oclass
+nv50_fifo_sclass[] = {
+       { 0x506f, &nv50_fifo_ofuncs },
+       {}
+};
+
+/*******************************************************************************
+ * FIFO context - basically just the instmem reserved for the channel
+ ******************************************************************************/
+
+static int
+nv50_fifo_context_ctor(struct nouveau_object *parent,
+                      struct nouveau_object *engine,
+                      struct nouveau_oclass *oclass, void *data, u32 size,
+                      struct nouveau_object **pobject)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nv50_fifo_priv *priv = nv_engine(dev, engine);
+       struct nv50_fifo_base *base;
+       int ret;
 
-       nouveau_irq_unregister(dev, 8);
+       ret = nouveau_fifo_context_create(parent, engine, oclass, NULL, 0x10000,
+                                         0x1000, NVOBJ_FLAG_HEAP, &base);
+       *pobject = nv_object(base);
+       if (ret)
+               return ret;
 
-       nouveau_gpuobj_ref(NULL, &priv->playlist[0]);
-       nouveau_gpuobj_ref(NULL, &priv->playlist[1]);
+       ret = nouveau_gpuobj_new(parent, nv_object(base), 0x0200, 0x1000,
+                                NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
+       if (ret)
+               return ret;
+
+       ret = nouveau_gpuobj_new(parent, nv_object(base), 0x1200, 0,
+                                NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
+       if (ret)
+               return ret;
+
+       ret = nouveau_gpuobj_new(parent, nv_object(base), 0x4000, 0, 0,
+                               &base->pgd);
+       if (ret)
+               return ret;
+
+       ret = nouveau_vm_ref(nouveau_client(parent)->vm, &base->vm, base->pgd);
+       if (ret)
+               return ret;
 
-       dev_priv->eng[engine] = NULL;
-       kfree(priv);
+       return 0;
 }
 
-int
-nv50_fifo_create(struct drm_device *dev)
+void
+nv50_fifo_context_dtor(struct nouveau_object *object)
+{
+       struct nv50_fifo_base *base = (void *)object;
+       nouveau_vm_ref(NULL, &base->vm, base->pgd);
+       nouveau_gpuobj_ref(NULL, &base->pgd);
+       nouveau_gpuobj_ref(NULL, &base->eng);
+       nouveau_gpuobj_ref(NULL, &base->ramfc);
+       nouveau_gpuobj_ref(NULL, &base->cache);
+       nouveau_fifo_context_destroy(&base->base);
+}
+
+static struct nouveau_oclass
+nv50_fifo_cclass = {
+       .handle = NV_ENGCTX(FIFO, 0x50),
+       .ofuncs = &(struct nouveau_ofuncs) {
+               .ctor = nv50_fifo_context_ctor,
+               .dtor = nv50_fifo_context_dtor,
+               .init = _nouveau_fifo_context_init,
+               .fini = _nouveau_fifo_context_fini,
+               .rd32 = _nouveau_fifo_context_rd32,
+               .wr32 = _nouveau_fifo_context_wr32,
+       },
+};
+
+/*******************************************************************************
+ * PFIFO engine
+ ******************************************************************************/
+
+static int
+nv50_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
+              struct nouveau_oclass *oclass, void *data, u32 size,
+              struct nouveau_object **pobject)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nv50_fifo_priv *priv;
        int ret;
 
-       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-       if (!priv)
-               return -ENOMEM;
-
-       priv->base.base.destroy = nv50_fifo_destroy;
-       priv->base.base.init = nv50_fifo_init;
-       priv->base.base.fini = nv50_fifo_fini;
-       priv->base.base.context_new = nv50_fifo_context_new;
-       priv->base.base.context_del = nv50_fifo_context_del;
-       priv->base.base.tlb_flush = nv50_fifo_tlb_flush;
-       priv->base.channels = 127;
-       dev_priv->eng[NVOBJ_ENGINE_FIFO] = &priv->base.base;
-
-       ret = nouveau_gpuobj_new(dev, NULL, priv->base.channels * 4, 0x1000,
-                                NVOBJ_FLAG_ZERO_ALLOC, &priv->playlist[0]);
+       ret = nouveau_fifo_create(parent, engine, oclass, 1, 127, &priv);
+       *pobject = nv_object(priv);
        if (ret)
-               goto error;
+               return ret;
 
-       ret = nouveau_gpuobj_new(dev, NULL, priv->base.channels * 4, 0x1000,
-                                NVOBJ_FLAG_ZERO_ALLOC, &priv->playlist[1]);
+       ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
+                               &priv->playlist[0]);
        if (ret)
-               goto error;
+               return ret;
 
-       nouveau_irq_register(dev, 8, nv04_fifo_isr);
-error:
+       ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
+                               &priv->playlist[1]);
        if (ret)
-               priv->base.base.destroy(dev, NVOBJ_ENGINE_FIFO);
-       return ret;
+               return ret;
+
+       nv_subdev(priv)->unit = 0x00000100;
+       nv_subdev(priv)->intr = nv04_fifo_intr;
+       nv_engine(priv)->cclass = &nv50_fifo_cclass;
+       nv_engine(priv)->sclass = nv50_fifo_sclass;
+       return 0;
+}
+
+void
+nv50_fifo_dtor(struct nouveau_object *object)
+{
+       struct nv50_fifo_priv *priv = (void *)object;
+
+       nouveau_gpuobj_ref(NULL, &priv->playlist[1]);
+       nouveau_gpuobj_ref(NULL, &priv->playlist[0]);
+
+       nouveau_fifo_destroy(&priv->base);
 }
+
+int
+nv50_fifo_init(struct nouveau_object *object)
+{
+       struct nv50_fifo_priv *priv = (void *)object;
+       int ret, i;
+
+       ret = nouveau_fifo_init(&priv->base);
+       if (ret)
+               return ret;
+
+       nv_mask(priv, 0x000200, 0x00000100, 0x00000000);
+       nv_mask(priv, 0x000200, 0x00000100, 0x00000100);
+       nv_wr32(priv, 0x00250c, 0x6f3cfc34);
+       nv_wr32(priv, 0x002044, 0x01003fff);
+
+       nv_wr32(priv, 0x002100, 0xffffffff);
+       nv_wr32(priv, 0x002140, 0xffffffff);
+
+       for (i = 0; i < 128; i++)
+               nv_wr32(priv, 0x002600 + (i * 4), 0x00000000);
+       nv50_fifo_playlist_update(priv);
+
+       nv_wr32(priv, 0x003200, 0x00000001);
+       nv_wr32(priv, 0x003250, 0x00000001);
+       nv_wr32(priv, 0x002500, 0x00000001);
+       return 0;
+}
+
+struct nouveau_oclass
+nv50_fifo_oclass = {
+       .handle = NV_ENGINE(FIFO, 0x50),
+       .ofuncs = &(struct nouveau_ofuncs) {
+               .ctor = nv50_fifo_ctor,
+               .dtor = nv50_fifo_dtor,
+               .init = nv50_fifo_init,
+               .fini = _nouveau_fifo_fini,
+       },
+};
This page took 0.032231 seconds and 5 git commands to generate.