drm/nouveau: port all engines to new engine module format
[deliverable/linux.git] / drivers / gpu / drm / nouveau / core / engine / fifo / nv04.c
index 6ab7eb0dd9bb6b012570b363804f6f5f55b063a6..8b7513f4dc8f214827a5a1ddae73cd9f3f9e2ab1 100644 (file)
@@ -1,44 +1,45 @@
 /*
- * 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 "nouveau_util.h"
+#include <core/os.h>
+#include <core/class.h>
+#include <core/engctx.h>
+#include <core/namedb.h>
+#include <core/handle.h>
 #include <core/ramht.h>
-#include "nouveau_software.h"
-
-static struct ramfc_desc {
-       unsigned bits:6;
-       unsigned ctxs:5;
-       unsigned ctxp:8;
-       unsigned regs:5;
-       unsigned regp;
-} nv04_ramfc[] = {
+
+#include <subdev/instmem.h>
+#include <subdev/instmem/nv04.h>
+#include <subdev/timer.h>
+#include <subdev/fb.h>
+
+#include <engine/fifo.h>
+
+#include "nv04.h"
+
+static struct ramfc_desc
+nv04_ramfc[] = {
        { 32,  0, 0x00,  0, NV04_PFIFO_CACHE1_DMA_PUT },
        { 32,  0, 0x04,  0, NV04_PFIFO_CACHE1_DMA_GET },
        { 16,  0, 0x08,  0, NV04_PFIFO_CACHE1_DMA_INSTANCE },
@@ -50,283 +51,360 @@ static struct ramfc_desc {
        {}
 };
 
-struct nv04_fifo_priv {
-       struct nouveau_fifo_priv base;
-       struct ramfc_desc *ramfc_desc;
-       struct nouveau_gpuobj *ramro;
-       struct nouveau_gpuobj *ramfc;
-};
+/*******************************************************************************
+ * FIFO channel objects
+ ******************************************************************************/
 
-struct nv04_fifo_chan {
-       struct nouveau_fifo_chan base;
-       u32 ramfc;
-};
-
-bool
-nv04_fifo_cache_pull(struct drm_device *dev, bool enable)
+int
+nv04_fifo_object_attach(struct nouveau_object *parent,
+                       struct nouveau_object *object, u32 handle)
 {
-       int pull = nv_mask(dev, NV04_PFIFO_CACHE1_PULL0, 1, enable);
-
-       if (!enable) {
-               /* In some cases the PFIFO puller may be left in an
-                * inconsistent state if you try to stop it when it's
-                * busy translating handles. Sometimes you get a
-                * PFIFO_CACHE_ERROR, sometimes it just fails silently
-                * sending incorrect instance offsets to PGRAPH after
-                * it's started up again. To avoid the latter we
-                * invalidate the most recently calculated instance.
-                */
-               if (!nv_wait(dev, NV04_PFIFO_CACHE1_PULL0,
-                                 NV04_PFIFO_CACHE1_PULL0_HASH_BUSY, 0))
-                       NV_ERROR(dev, "Timeout idling the PFIFO puller.\n");
-
-               if (nv_rd32(dev, NV04_PFIFO_CACHE1_PULL0) &
-                                NV04_PFIFO_CACHE1_PULL0_HASH_FAILED)
-                       nv_wr32(dev, NV03_PFIFO_INTR_0,
-                                    NV_PFIFO_INTR_CACHE_ERROR);
-
-               nv_wr32(dev, NV04_PFIFO_CACHE1_HASH, 0);
+       struct nv04_fifo_priv *priv = (void *)parent->engine;
+       struct nv04_fifo_chan *chan = (void *)parent;
+       u32 context, chid = chan->base.chid;
+       int ret;
+
+       if (nv_iclass(object, NV_GPUOBJ_CLASS))
+               context = nv_gpuobj(object)->addr >> 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 |= 0x00010000;
+               break;
+       case NVDEV_ENGINE_MPEG:
+               context |= 0x00020000;
+               break;
+       default:
+               return -EINVAL;
        }
 
-       return pull & 1;
+       context |= 0x80000000; /* valid */
+       context |= chid << 24;
+
+       mutex_lock(&nv_subdev(priv)->mutex);
+       ret = nouveau_ramht_insert(priv->ramht, chid, handle, context);
+       mutex_unlock(&nv_subdev(priv)->mutex);
+       return ret;
+}
+
+void
+nv04_fifo_object_detach(struct nouveau_object *parent, int cookie)
+{
+       struct nv04_fifo_priv *priv = (void *)parent->engine;
+       mutex_lock(&nv_subdev(priv)->mutex);
+       nouveau_ramht_remove(priv->ramht, cookie);
+       mutex_unlock(&nv_subdev(priv)->mutex);
 }
 
 static int
-nv04_fifo_context_new(struct nouveau_channel *chan, int engine)
+nv04_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_device *dev = chan->dev;
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nv04_fifo_priv *priv = nv_engine(dev, engine);
-       struct nv04_fifo_chan *fctx;
-       unsigned long flags;
+       struct nv04_fifo_priv *priv = (void *)engine;
+       struct nv04_fifo_chan *chan;
+       struct nv_channel_dma_class *args = data;
        int ret;
 
-       fctx = chan->engctx[engine] = kzalloc(sizeof(*fctx), GFP_KERNEL);
-       if (!fctx)
-               return -ENOMEM;
+       if (size < sizeof(*args))
+               return -EINVAL;
 
-       fctx->ramfc = chan->id * 32;
+       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
+                                         0x10000, args->pushbuf,
+                                         (1 << NVDEV_ENGINE_DMAOBJ) |
+                                         (1 << NVDEV_ENGINE_SW) |
+                                         (1 << NVDEV_ENGINE_GR), &chan);
+       *pobject = nv_object(chan);
+       if (ret)
+               return ret;
 
-       /* map channel control registers */
-       chan->user = ioremap(pci_resource_start(dev->pdev, 0) +
-                            NV03_USER(chan->id), PAGE_SIZE);
-       if (!chan->user) {
-               ret = -ENOMEM;
-               goto error;
-       }
+       nv_parent(chan)->object_attach = nv04_fifo_object_attach;
+       nv_parent(chan)->object_detach = nv04_fifo_object_detach;
+       chan->ramfc = chan->base.chid * 32;
 
-       /* initialise default fifo context */
-       nv_wo32(priv->ramfc, fctx->ramfc + 0x00, chan->pushbuf_base);
-       nv_wo32(priv->ramfc, fctx->ramfc + 0x04, chan->pushbuf_base);
-       nv_wo32(priv->ramfc, fctx->ramfc + 0x08, chan->pushbuf->addr >> 4);
-       nv_wo32(priv->ramfc, fctx->ramfc + 0x10,
+       nv_wo32(priv->ramfc, chan->ramfc + 0x00, args->offset);
+       nv_wo32(priv->ramfc, chan->ramfc + 0x04, args->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 |
                             NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
 #ifdef __BIG_ENDIAN
                             NV_PFIFO_CACHE1_BIG_ENDIAN |
 #endif
                             NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8);
+       return 0;
+}
+
+void
+nv04_fifo_chan_dtor(struct nouveau_object *object)
+{
+       struct nv04_fifo_priv *priv = (void *)object->engine;
+       struct nv04_fifo_chan *chan = (void *)object;
+       struct ramfc_desc *c = priv->ramfc_desc;
 
-       /* enable dma mode on the channel */
-       spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
-       nv_mask(dev, NV04_PFIFO_MODE, (1 << chan->id), (1 << chan->id));
-       spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
+       do {
+               nv_wo32(priv->ramfc, chan->ramfc + c->ctxp, 0x00000000);
+       } while ((++c)->bits);
+
+       nouveau_fifo_channel_destroy(&chan->base);
+}
 
-error:
+int
+nv04_fifo_chan_init(struct nouveau_object *object)
+{
+       struct nv04_fifo_priv *priv = (void *)object->engine;
+       struct nv04_fifo_chan *chan = (void *)object;
+       u32 mask = 1 << chan->base.chid;
+       unsigned long flags;
+       int ret;
+
+       ret = nouveau_fifo_channel_init(&chan->base);
        if (ret)
-               priv->base.base.context_del(chan, engine);
-       return ret;
+               return ret;
+
+       spin_lock_irqsave(&priv->base.lock, flags);
+       nv_mask(priv, NV04_PFIFO_MODE, mask, mask);
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+       return 0;
 }
 
-void
-nv04_fifo_context_del(struct nouveau_channel *chan, int engine)
+int
+nv04_fifo_chan_fini(struct nouveau_object *object, bool suspend)
 {
-       struct drm_device *dev = chan->dev;
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nv04_fifo_priv *priv = nv_engine(chan->dev, engine);
-       struct nv04_fifo_chan *fctx = chan->engctx[engine];
-       struct ramfc_desc *c = priv->ramfc_desc;
+       struct nv04_fifo_priv *priv = (void *)object->engine;
+       struct nv04_fifo_chan *chan = (void *)object;
+       struct nouveau_gpuobj *fctx = priv->ramfc;
+       struct ramfc_desc *c;
        unsigned long flags;
-       int chid;
+       u32 data = chan->ramfc;
+       u32 chid;
 
        /* prevent fifo context switches */
-       spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
-       nv_wr32(dev, NV03_PFIFO_CACHES, 0);
+       spin_lock_irqsave(&priv->base.lock, flags);
+       nv_wr32(priv, NV03_PFIFO_CACHES, 0);
 
        /* if this channel is active, replace it with a null context */
-       chid = nv_rd32(dev, NV03_PFIFO_CACHE1_PUSH1) & priv->base.channels;
-       if (chid == chan->id) {
-               nv_mask(dev, NV04_PFIFO_CACHE1_DMA_PUSH, 0x00000001, 0);
-               nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0, 0);
-               nv_mask(dev, NV04_PFIFO_CACHE1_PULL0, 0x00000001, 0);
+       chid = nv_rd32(priv, NV03_PFIFO_CACHE1_PUSH1) & priv->base.max;
+       if (chid == chan->base.chid) {
+               nv_mask(priv, NV04_PFIFO_CACHE1_DMA_PUSH, 0x00000001, 0);
+               nv_wr32(priv, NV03_PFIFO_CACHE1_PUSH0, 0);
+               nv_mask(priv, NV04_PFIFO_CACHE1_PULL0, 0x00000001, 0);
 
+               c = priv->ramfc_desc;
                do {
-                       u32 mask = ((1ULL << c->bits) - 1) << c->regs;
-                       nv_mask(dev, c->regp, mask, 0x00000000);
-                       nv_wo32(priv->ramfc, fctx->ramfc + c->ctxp, 0x00000000);
+                       u32 rm = ((1ULL << c->bits) - 1) << c->regs;
+                       u32 cm = ((1ULL << c->bits) - 1) << c->ctxs;
+                       u32 rv = (nv_rd32(priv, c->regp) &  rm) >> c->regs;
+                       u32 cv = (nv_ro32(fctx, c->ctxp + data) & ~cm);
+                       nv_wo32(fctx, c->ctxp + data, cv | (rv << c->ctxs));
+               } while ((++c)->bits);
+
+               c = priv->ramfc_desc;
+               do {
+                       nv_wr32(priv, c->regp, 0x00000000);
                } while ((++c)->bits);
 
-               nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
-               nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
-               nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, priv->base.channels);
-               nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0, 1);
-               nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 1);
+               nv_wr32(priv, NV03_PFIFO_CACHE1_GET, 0);
+               nv_wr32(priv, NV03_PFIFO_CACHE1_PUT, 0);
+               nv_wr32(priv, NV03_PFIFO_CACHE1_PUSH1, priv->base.max);
+               nv_wr32(priv, NV03_PFIFO_CACHE1_PUSH0, 1);
+               nv_wr32(priv, NV04_PFIFO_CACHE1_PULL0, 1);
        }
 
        /* restore normal operation, after disabling dma mode */
-       nv_mask(dev, NV04_PFIFO_MODE, 1 << chan->id, 0);
-       nv_wr32(dev, NV03_PFIFO_CACHES, 1);
-       spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
-
-       /* clean up */
-       nouveau_gpuobj_ref(NULL, &chan->ramfc); /*XXX: nv40 */
-       if (chan->user) {
-               iounmap(chan->user);
-               chan->user = NULL;
-       }
+       nv_mask(priv, NV04_PFIFO_MODE, 1 << chan->base.chid, 0);
+       nv_wr32(priv, NV03_PFIFO_CACHES, 1);
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+
+       return nouveau_fifo_channel_fini(&chan->base, suspend);
 }
 
+static struct nouveau_ofuncs
+nv04_fifo_ofuncs = {
+       .ctor = nv04_fifo_chan_ctor,
+       .dtor = nv04_fifo_chan_dtor,
+       .init = nv04_fifo_chan_init,
+       .fini = nv04_fifo_chan_fini,
+       .rd32 = _nouveau_fifo_channel_rd32,
+       .wr32 = _nouveau_fifo_channel_wr32,
+};
+
+static struct nouveau_oclass
+nv04_fifo_sclass[] = {
+       { 0x006e, &nv04_fifo_ofuncs },
+       {}
+};
+
+/*******************************************************************************
+ * FIFO context - basically just the instmem reserved for the channel
+ ******************************************************************************/
+
 int
-nv04_fifo_init(struct drm_device *dev, int engine)
+nv04_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 nv04_fifo_priv *priv = nv_engine(dev, engine);
-       int i;
+       struct nv04_fifo_base *base;
+       int ret;
 
-       nv_mask(dev, NV03_PMC_ENABLE, NV_PMC_ENABLE_PFIFO, 0);
-       nv_mask(dev, NV03_PMC_ENABLE, NV_PMC_ENABLE_PFIFO, NV_PMC_ENABLE_PFIFO);
+       ret = nouveau_fifo_context_create(parent, engine, oclass, NULL, 0x1000,
+                                         0x1000, NVOBJ_FLAG_HEAP, &base);
+       *pobject = nv_object(base);
+       if (ret)
+               return ret;
 
-       nv_wr32(dev, NV04_PFIFO_DELAY_0, 0x000000ff);
-       nv_wr32(dev, NV04_PFIFO_DMA_TIMESLICE, 0x0101ffff);
+       return 0;
+}
 
-       nv_wr32(dev, NV03_PFIFO_RAMHT, (0x03 << 24) /* search 128 */ |
-                                      ((dev_priv->ramht->bits - 9) << 16) |
-                                      (dev_priv->ramht->gpuobj->addr >> 8));
-       nv_wr32(dev, NV03_PFIFO_RAMRO, priv->ramro->addr >> 8);
-       nv_wr32(dev, NV03_PFIFO_RAMFC, priv->ramfc->addr >> 8);
+static struct nouveau_oclass
+nv04_fifo_cclass = {
+       .handle = NV_ENGCTX(FIFO, 0x04),
+       .ofuncs = &(struct nouveau_ofuncs) {
+               .ctor = nv04_fifo_context_ctor,
+               .dtor = _nouveau_fifo_context_dtor,
+               .init = _nouveau_fifo_context_init,
+               .fini = _nouveau_fifo_context_fini,
+               .rd32 = _nouveau_fifo_context_rd32,
+               .wr32 = _nouveau_fifo_context_wr32,
+       },
+};
 
-       nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, priv->base.channels);
+/*******************************************************************************
+ * PFIFO engine
+ ******************************************************************************/
 
-       nv_wr32(dev, NV03_PFIFO_INTR_0, 0xffffffff);
-       nv_wr32(dev, NV03_PFIFO_INTR_EN_0, 0xffffffff);
+void
+nv04_fifo_pause(struct nouveau_fifo *pfifo, unsigned long *pflags)
+__acquires(priv->base.lock)
+{
+       struct nv04_fifo_priv *priv = (void *)pfifo;
+       unsigned long flags;
 
-       nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0, 1);
-       nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 1);
-       nv_wr32(dev, NV03_PFIFO_CACHES, 1);
+       spin_lock_irqsave(&priv->base.lock, flags);
+       *pflags = flags;
+
+       nv_wr32(priv, NV03_PFIFO_CACHES, 0x00000000);
+       nv_mask(priv, NV04_PFIFO_CACHE1_PULL0, 0x00000001, 0x00000000);
+
+       /* in some cases the puller may be left in an inconsistent state
+        * if you try to stop it while it's busy translating handles.
+        * sometimes you get a CACHE_ERROR, sometimes it just fails
+        * silently; sending incorrect instance offsets to PGRAPH after
+        * it's started up again.
+        *
+        * to avoid this, we invalidate the most recently calculated
+        * instance.
+        */
+       if (!nv_wait(priv, NV04_PFIFO_CACHE1_PULL0,
+                          NV04_PFIFO_CACHE1_PULL0_HASH_BUSY, 0x00000000))
+               nv_warn(priv, "timeout idling puller\n");
+
+       if (nv_rd32(priv, NV04_PFIFO_CACHE1_PULL0) &
+                         NV04_PFIFO_CACHE1_PULL0_HASH_FAILED)
+               nv_wr32(priv, NV03_PFIFO_INTR_0, NV_PFIFO_INTR_CACHE_ERROR);
+
+       nv_wr32(priv, NV04_PFIFO_CACHE1_HASH, 0x00000000);
+}
 
-       for (i = 0; i < priv->base.channels; i++) {
-               if (dev_priv->channels.ptr[i])
-                       nv_mask(dev, NV04_PFIFO_MODE, (1 << i), (1 << i));
-       }
+void
+nv04_fifo_start(struct nouveau_fifo *pfifo, unsigned long *pflags)
+__releases(priv->base.lock)
+{
+       struct nv04_fifo_priv *priv = (void *)pfifo;
+       unsigned long flags = *pflags;
 
-       return 0;
+       nv_mask(priv, NV04_PFIFO_CACHE1_PULL0, 0x00000001, 0x00000001);
+       nv_wr32(priv, NV03_PFIFO_CACHES, 0x00000001);
+
+       spin_unlock_irqrestore(&priv->base.lock, flags);
 }
 
-int
-nv04_fifo_fini(struct drm_device *dev, int engine, bool suspend)
+static const char *
+nv_dma_state_err(u32 state)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nv04_fifo_priv *priv = nv_engine(dev, engine);
-       struct nouveau_channel *chan;
-       int chid;
-
-       /* prevent context switches and halt fifo operation */
-       nv_wr32(dev, NV03_PFIFO_CACHES, 0);
-       nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUSH, 0);
-       nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0, 0);
-       nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 0);
-
-       /* store current fifo context in ramfc */
-       chid = nv_rd32(dev, NV03_PFIFO_CACHE1_PUSH1) & priv->base.channels;
-       chan = dev_priv->channels.ptr[chid];
-       if (suspend && chid != priv->base.channels && chan) {
-               struct nv04_fifo_chan *fctx = chan->engctx[engine];
-               struct nouveau_gpuobj *ctx = priv->ramfc;
-               struct ramfc_desc *c = priv->ramfc_desc;
-               do {
-                       u32 rm = ((1ULL << c->bits) - 1) << c->regs;
-                       u32 cm = ((1ULL << c->bits) - 1) << c->ctxs;
-                       u32 rv = (nv_rd32(dev, c->regp) &  rm) >> c->regs;
-                       u32 cv = (nv_ro32(ctx, c->ctxp + fctx->ramfc) & ~cm);
-                       nv_wo32(ctx, c->ctxp + fctx->ramfc, cv | (rv << c->ctxs));
-               } while ((++c)->bits);
-       }
-
-       nv_wr32(dev, NV03_PFIFO_INTR_EN_0, 0x00000000);
-       return 0;
+       static const char * const desc[] = {
+               "NONE", "CALL_SUBR_ACTIVE", "INVALID_MTHD", "RET_SUBR_INACTIVE",
+               "INVALID_CMD", "IB_EMPTY"/* NV50+ */, "MEM_FAULT", "UNK"
+       };
+       return desc[(state >> 29) & 0x7];
 }
 
 static bool
-nouveau_fifo_swmthd(struct drm_device *dev, u32 chid, u32 addr, u32 data)
+nv04_fifo_swmthd(struct nv04_fifo_priv *priv, u32 chid, u32 addr, u32 data)
 {
-       struct nouveau_fifo_priv *pfifo = nv_engine(dev, NVOBJ_ENGINE_FIFO);
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nouveau_channel *chan = NULL;
-       struct nouveau_gpuobj *obj;
-       unsigned long flags;
+       struct nv04_fifo_chan *chan = NULL;
+       struct nouveau_handle *bind;
        const int subc = (addr >> 13) & 0x7;
        const int mthd = addr & 0x1ffc;
        bool handled = false;
+       unsigned long flags;
        u32 engine;
 
-       spin_lock_irqsave(&dev_priv->channels.lock, flags);
-       if (likely(chid >= 0 && chid < pfifo->channels))
-               chan = dev_priv->channels.ptr[chid];
+       spin_lock_irqsave(&priv->base.lock, flags);
+       if (likely(chid >= priv->base.min && chid <= priv->base.max))
+               chan = (void *)priv->base.channel[chid];
        if (unlikely(!chan))
                goto out;
 
        switch (mthd) {
-       case 0x0000: /* bind object to subchannel */
-               obj = nouveau_ramht_find(chan, data);
-               if (unlikely(!obj || obj->engine != NVOBJ_ENGINE_SW))
+       case 0x0000:
+               bind = nouveau_namedb_get(nv_namedb(chan), data);
+               if (unlikely(!bind))
                        break;
 
-               engine = 0x0000000f << (subc * 4);
+               if (nv_engidx(bind->object->engine) == NVDEV_ENGINE_SW) {
+                       engine = 0x0000000f << (subc * 4);
+                       chan->subc[subc] = data;
+                       handled = true;
+
+                       nv_mask(priv, NV04_PFIFO_CACHE1_ENGINE, engine, 0);
+               }
 
-               nv_mask(dev, NV04_PFIFO_CACHE1_ENGINE, engine, 0x00000000);
-               handled = true;
+               nouveau_namedb_put(bind);
                break;
        default:
-               engine = nv_rd32(dev, NV04_PFIFO_CACHE1_ENGINE);
+               engine = nv_rd32(priv, NV04_PFIFO_CACHE1_ENGINE);
                if (unlikely(((engine >> (subc * 4)) & 0xf) != 0))
                        break;
 
-               if (!nouveau_gpuobj_mthd_call(chan, nouveau_software_class(dev),
-                                             mthd, data))
-                       handled = true;
+               bind = nouveau_namedb_get(nv_namedb(chan), chan->subc[subc]);
+               if (likely(bind)) {
+                       if (!nv_call(bind->object, mthd, data))
+                               handled = true;
+                       nouveau_namedb_put(bind);
+               }
                break;
        }
 
 out:
-       spin_unlock_irqrestore(&dev_priv->channels.lock, flags);
+       spin_unlock_irqrestore(&priv->base.lock, flags);
        return handled;
 }
 
-static const char *nv_dma_state_err(u32 state)
-{
-       static const char * const desc[] = {
-               "NONE", "CALL_SUBR_ACTIVE", "INVALID_MTHD", "RET_SUBR_INACTIVE",
-               "INVALID_CMD", "IB_EMPTY"/* NV50+ */, "MEM_FAULT", "UNK"
-       };
-       return desc[(state >> 29) & 0x7];
-}
-
 void
-nv04_fifo_isr(struct drm_device *dev)
+nv04_fifo_intr(struct nouveau_subdev *subdev)
 {
-       struct nouveau_fifo_priv *pfifo = nv_engine(dev, NVOBJ_ENGINE_FIFO);
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
+       struct nouveau_device *device = nv_device(subdev);
+       struct nv04_fifo_priv *priv = (void *)subdev;
        uint32_t status, reassign;
        int cnt = 0;
 
-       reassign = nv_rd32(dev, NV03_PFIFO_CACHES) & 1;
-       while ((status = nv_rd32(dev, NV03_PFIFO_INTR_0)) && (cnt++ < 100)) {
+       reassign = nv_rd32(priv, NV03_PFIFO_CACHES) & 1;
+       while ((status = nv_rd32(priv, NV03_PFIFO_INTR_0)) && (cnt++ < 100)) {
                uint32_t chid, get;
 
-               nv_wr32(dev, NV03_PFIFO_CACHES, 0);
+               nv_wr32(priv, NV03_PFIFO_CACHES, 0);
 
-               chid = nv_rd32(dev, NV03_PFIFO_CACHE1_PUSH1) & pfifo->channels;
-               get  = nv_rd32(dev, NV03_PFIFO_CACHE1_GET);
+               chid = nv_rd32(priv, NV03_PFIFO_CACHE1_PUSH1) & priv->base.max;
+               get  = nv_rd32(priv, NV03_PFIFO_CACHE1_GET);
 
                if (status & NV_PFIFO_INTR_CACHE_ERROR) {
                        uint32_t mthd, data;
@@ -340,86 +418,85 @@ nv04_fifo_isr(struct drm_device *dev)
                         */
                        ptr = (get & 0x7ff) >> 2;
 
-                       if (dev_priv->card_type < NV_40) {
-                               mthd = nv_rd32(dev,
+                       if (device->card_type < NV_40) {
+                               mthd = nv_rd32(priv,
                                        NV04_PFIFO_CACHE1_METHOD(ptr));
-                               data = nv_rd32(dev,
+                               data = nv_rd32(priv,
                                        NV04_PFIFO_CACHE1_DATA(ptr));
                        } else {
-                               mthd = nv_rd32(dev,
+                               mthd = nv_rd32(priv,
                                        NV40_PFIFO_CACHE1_METHOD(ptr));
-                               data = nv_rd32(dev,
+                               data = nv_rd32(priv,
                                        NV40_PFIFO_CACHE1_DATA(ptr));
                        }
 
-                       if (!nouveau_fifo_swmthd(dev, chid, mthd, data)) {
-                               NV_INFO(dev, "PFIFO_CACHE_ERROR - Ch %d/%d "
-                                            "Mthd 0x%04x Data 0x%08x\n",
+                       if (!nv04_fifo_swmthd(priv, chid, mthd, data)) {
+                               nv_info(priv, "CACHE_ERROR - Ch %d/%d "
+                                             "Mthd 0x%04x Data 0x%08x\n",
                                        chid, (mthd >> 13) & 7, mthd & 0x1ffc,
                                        data);
                        }
 
-                       nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUSH, 0);
-                       nv_wr32(dev, NV03_PFIFO_INTR_0,
+                       nv_wr32(priv, NV04_PFIFO_CACHE1_DMA_PUSH, 0);
+                       nv_wr32(priv, NV03_PFIFO_INTR_0,
                                                NV_PFIFO_INTR_CACHE_ERROR);
 
-                       nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0,
-                               nv_rd32(dev, NV03_PFIFO_CACHE1_PUSH0) & ~1);
-                       nv_wr32(dev, NV03_PFIFO_CACHE1_GET, get + 4);
-                       nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH0,
-                               nv_rd32(dev, NV03_PFIFO_CACHE1_PUSH0) | 1);
-                       nv_wr32(dev, NV04_PFIFO_CACHE1_HASH, 0);
+                       nv_wr32(priv, NV03_PFIFO_CACHE1_PUSH0,
+                               nv_rd32(priv, NV03_PFIFO_CACHE1_PUSH0) & ~1);
+                       nv_wr32(priv, NV03_PFIFO_CACHE1_GET, get + 4);
+                       nv_wr32(priv, NV03_PFIFO_CACHE1_PUSH0,
+                               nv_rd32(priv, NV03_PFIFO_CACHE1_PUSH0) | 1);
+                       nv_wr32(priv, NV04_PFIFO_CACHE1_HASH, 0);
 
-                       nv_wr32(dev, NV04_PFIFO_CACHE1_DMA_PUSH,
-                               nv_rd32(dev, NV04_PFIFO_CACHE1_DMA_PUSH) | 1);
-                       nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 1);
+                       nv_wr32(priv, NV04_PFIFO_CACHE1_DMA_PUSH,
+                               nv_rd32(priv, NV04_PFIFO_CACHE1_DMA_PUSH) | 1);
+                       nv_wr32(priv, NV04_PFIFO_CACHE1_PULL0, 1);
 
                        status &= ~NV_PFIFO_INTR_CACHE_ERROR;
                }
 
                if (status & NV_PFIFO_INTR_DMA_PUSHER) {
-                       u32 dma_get = nv_rd32(dev, 0x003244);
-                       u32 dma_put = nv_rd32(dev, 0x003240);
-                       u32 push = nv_rd32(dev, 0x003220);
-                       u32 state = nv_rd32(dev, 0x003228);
-
-                       if (dev_priv->card_type == NV_50) {
-                               u32 ho_get = nv_rd32(dev, 0x003328);
-                               u32 ho_put = nv_rd32(dev, 0x003320);
-                               u32 ib_get = nv_rd32(dev, 0x003334);
-                               u32 ib_put = nv_rd32(dev, 0x003330);
-
-                               if (nouveau_ratelimit())
-                                       NV_INFO(dev, "PFIFO_DMA_PUSHER - Ch %d Get 0x%02x%08x "
-                                            "Put 0x%02x%08x IbGet 0x%08x IbPut 0x%08x "
-                                            "State 0x%08x (err: %s) Push 0x%08x\n",
-                                               chid, ho_get, dma_get, ho_put,
-                                               dma_put, ib_get, ib_put, state,
-                                               nv_dma_state_err(state),
-                                               push);
+                       u32 dma_get = nv_rd32(priv, 0x003244);
+                       u32 dma_put = nv_rd32(priv, 0x003240);
+                       u32 push = nv_rd32(priv, 0x003220);
+                       u32 state = nv_rd32(priv, 0x003228);
+
+                       if (device->card_type == NV_50) {
+                               u32 ho_get = nv_rd32(priv, 0x003328);
+                               u32 ho_put = nv_rd32(priv, 0x003320);
+                               u32 ib_get = nv_rd32(priv, 0x003334);
+                               u32 ib_put = nv_rd32(priv, 0x003330);
+
+                               nv_info(priv, "DMA_PUSHER - Ch %d Get 0x%02x%08x "
+                                    "Put 0x%02x%08x IbGet 0x%08x IbPut 0x%08x "
+                                    "State 0x%08x (err: %s) Push 0x%08x\n",
+                                       chid, ho_get, dma_get, ho_put,
+                                       dma_put, ib_get, ib_put, state,
+                                       nv_dma_state_err(state),
+                                       push);
 
                                /* METHOD_COUNT, in DMA_STATE on earlier chipsets */
-                               nv_wr32(dev, 0x003364, 0x00000000);
+                               nv_wr32(priv, 0x003364, 0x00000000);
                                if (dma_get != dma_put || ho_get != ho_put) {
-                                       nv_wr32(dev, 0x003244, dma_put);
-                                       nv_wr32(dev, 0x003328, ho_put);
+                                       nv_wr32(priv, 0x003244, dma_put);
+                                       nv_wr32(priv, 0x003328, ho_put);
                                } else
                                if (ib_get != ib_put) {
-                                       nv_wr32(dev, 0x003334, ib_put);
+                                       nv_wr32(priv, 0x003334, ib_put);
                                }
                        } else {
-                               NV_INFO(dev, "PFIFO_DMA_PUSHER - Ch %d Get 0x%08x "
+                               nv_info(priv, "DMA_PUSHER - Ch %d Get 0x%08x "
                                             "Put 0x%08x State 0x%08x (err: %s) Push 0x%08x\n",
                                        chid, dma_get, dma_put, state,
                                        nv_dma_state_err(state), push);
 
                                if (dma_get != dma_put)
-                                       nv_wr32(dev, 0x003244, dma_put);
+                                       nv_wr32(priv, 0x003244, dma_put);
                        }
 
-                       nv_wr32(dev, 0x003228, 0x00000000);
-                       nv_wr32(dev, 0x003220, 0x00000001);
-                       nv_wr32(dev, 0x002100, NV_PFIFO_INTR_DMA_PUSHER);
+                       nv_wr32(priv, 0x003228, 0x00000000);
+                       nv_wr32(priv, 0x003220, 0x00000001);
+                       nv_wr32(priv, 0x002100, NV_PFIFO_INTR_DMA_PUSHER);
                        status &= ~NV_PFIFO_INTR_DMA_PUSHER;
                }
 
@@ -427,81 +504,118 @@ nv04_fifo_isr(struct drm_device *dev)
                        uint32_t sem;
 
                        status &= ~NV_PFIFO_INTR_SEMAPHORE;
-                       nv_wr32(dev, NV03_PFIFO_INTR_0,
+                       nv_wr32(priv, NV03_PFIFO_INTR_0,
                                NV_PFIFO_INTR_SEMAPHORE);
 
-                       sem = nv_rd32(dev, NV10_PFIFO_CACHE1_SEMAPHORE);
-                       nv_wr32(dev, NV10_PFIFO_CACHE1_SEMAPHORE, sem | 0x1);
+                       sem = nv_rd32(priv, NV10_PFIFO_CACHE1_SEMAPHORE);
+                       nv_wr32(priv, NV10_PFIFO_CACHE1_SEMAPHORE, sem | 0x1);
 
-                       nv_wr32(dev, NV03_PFIFO_CACHE1_GET, get + 4);
-                       nv_wr32(dev, NV04_PFIFO_CACHE1_PULL0, 1);
+                       nv_wr32(priv, NV03_PFIFO_CACHE1_GET, get + 4);
+                       nv_wr32(priv, NV04_PFIFO_CACHE1_PULL0, 1);
                }
 
-               if (dev_priv->card_type == NV_50) {
+               if (device->card_type == NV_50) {
                        if (status & 0x00000010) {
-                               nv50_fb_vm_trap(dev, nouveau_ratelimit());
+                               nv50_fb_trap(nouveau_fb(priv), 1);
                                status &= ~0x00000010;
-                               nv_wr32(dev, 0x002100, 0x00000010);
+                               nv_wr32(priv, 0x002100, 0x00000010);
                        }
                }
 
                if (status) {
-                       if (nouveau_ratelimit())
-                               NV_INFO(dev, "PFIFO_INTR 0x%08x - Ch %d\n",
-                                       status, chid);
-                       nv_wr32(dev, NV03_PFIFO_INTR_0, status);
+                       nv_info(priv, "unknown intr 0x%08x, ch %d\n",
+                               status, chid);
+                       nv_wr32(priv, NV03_PFIFO_INTR_0, status);
                        status = 0;
                }
 
-               nv_wr32(dev, NV03_PFIFO_CACHES, reassign);
+               nv_wr32(priv, NV03_PFIFO_CACHES, reassign);
        }
 
        if (status) {
-               NV_INFO(dev, "PFIFO still angry after %d spins, halt\n", cnt);
-               nv_wr32(dev, 0x2140, 0);
-               nv_wr32(dev, 0x140, 0);
+               nv_info(priv, "still angry after %d spins, halt\n", cnt);
+               nv_wr32(priv, 0x002140, 0);
+               nv_wr32(priv, 0x000140, 0);
        }
 
-       nv_wr32(dev, NV03_PMC_INTR_0, NV_PMC_INTR_0_PFIFO_PENDING);
+       nv_wr32(priv, 0x000100, 0x00000100);
 }
 
-void
-nv04_fifo_destroy(struct drm_device *dev, int engine)
+static int
+nv04_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 nv04_fifo_priv *priv = nv_engine(dev, engine);
+       struct nv04_instmem_priv *imem = nv04_instmem(parent);
+       struct nv04_fifo_priv *priv;
+       int ret;
 
-       nouveau_irq_unregister(dev, 8);
+       ret = nouveau_fifo_create(parent, engine, oclass, 0, 15, &priv);
+       *pobject = nv_object(priv);
+       if (ret)
+               return ret;
+
+       nouveau_ramht_ref(imem->ramht, &priv->ramht);
+       nouveau_gpuobj_ref(imem->ramro, &priv->ramro);
+       nouveau_gpuobj_ref(imem->ramfc, &priv->ramfc);
+
+       nv_subdev(priv)->unit = 0x00000100;
+       nv_subdev(priv)->intr = nv04_fifo_intr;
+       nv_engine(priv)->cclass = &nv04_fifo_cclass;
+       nv_engine(priv)->sclass = nv04_fifo_sclass;
+       priv->base.pause = nv04_fifo_pause;
+       priv->base.start = nv04_fifo_start;
+       priv->ramfc_desc = nv04_ramfc;
+       return 0;
+}
 
+void
+nv04_fifo_dtor(struct nouveau_object *object)
+{
+       struct nv04_fifo_priv *priv = (void *)object;
        nouveau_gpuobj_ref(NULL, &priv->ramfc);
        nouveau_gpuobj_ref(NULL, &priv->ramro);
-
-       dev_priv->eng[engine] = NULL;
-       kfree(priv);
+       nouveau_ramht_ref(NULL, &priv->ramht);
+       nouveau_fifo_destroy(&priv->base);
 }
 
 int
-nv04_fifo_create(struct drm_device *dev)
+nv04_fifo_init(struct nouveau_object *object)
 {
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nv04_fifo_priv *priv;
+       struct nv04_fifo_priv *priv = (void *)object;
+       int ret;
+
+       ret = nouveau_fifo_init(&priv->base);
+       if (ret)
+               return ret;
 
-       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-       if (!priv)
-               return -ENOMEM;
+       nv_wr32(priv, NV04_PFIFO_DELAY_0, 0x000000ff);
+       nv_wr32(priv, NV04_PFIFO_DMA_TIMESLICE, 0x0101ffff);
 
-       nouveau_gpuobj_ref(nvimem_ramro(dev), &priv->ramro);
-       nouveau_gpuobj_ref(nvimem_ramfc(dev), &priv->ramfc);
+       nv_wr32(priv, NV03_PFIFO_RAMHT, (0x03 << 24) /* search 128 */ |
+                                      ((priv->ramht->bits - 9) << 16) |
+                                       (priv->ramht->base.addr >> 8));
+       nv_wr32(priv, NV03_PFIFO_RAMRO, priv->ramro->addr >> 8);
+       nv_wr32(priv, NV03_PFIFO_RAMFC, priv->ramfc->addr >> 8);
 
-       priv->base.base.destroy = nv04_fifo_destroy;
-       priv->base.base.init = nv04_fifo_init;
-       priv->base.base.fini = nv04_fifo_fini;
-       priv->base.base.context_new = nv04_fifo_context_new;
-       priv->base.base.context_del = nv04_fifo_context_del;
-       priv->base.channels = 15;
-       priv->ramfc_desc = nv04_ramfc;
-       dev_priv->eng[NVOBJ_ENGINE_FIFO] = &priv->base.base;
+       nv_wr32(priv, NV03_PFIFO_CACHE1_PUSH1, priv->base.max);
 
-       nouveau_irq_register(dev, 8, nv04_fifo_isr);
+       nv_wr32(priv, NV03_PFIFO_INTR_0, 0xffffffff);
+       nv_wr32(priv, NV03_PFIFO_INTR_EN_0, 0xffffffff);
+
+       nv_wr32(priv, NV03_PFIFO_CACHE1_PUSH0, 1);
+       nv_wr32(priv, NV04_PFIFO_CACHE1_PULL0, 1);
+       nv_wr32(priv, NV03_PFIFO_CACHES, 1);
        return 0;
 }
+
+struct nouveau_oclass
+nv04_fifo_oclass = {
+       .handle = NV_ENGINE(FIFO, 0x04),
+       .ofuncs = &(struct nouveau_ofuncs) {
+               .ctor = nv04_fifo_ctor,
+               .dtor = nv04_fifo_dtor,
+               .init = nv04_fifo_init,
+               .fini = _nouveau_fifo_fini,
+       },
+};
This page took 0.0461 seconds and 5 git commands to generate.