drm/nouveau/fifo: turn all fifo modules into engine modules

Been tested on each major revision that's relevant here, but I'm sure there
are still bugs waiting to be ironed out.

This is a *very* invasive change.

There's a couple of pieces left that I don't like much (eg. other engines
using fifo_priv for the channel count), but that's an artefact of there
being a master channel list still.  This is changing, slowly.

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

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
index 1acc626f74b0..ef7a934a499a 100644
--- a/drivers/gpu/drm/nouveau/nv04_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
@@ -1,6 +1,8 @@
 #include "drmP.h"
 #include "drm.h"
+
 #include "nouveau_drv.h"
+#include "nouveau_fifo.h"
 #include "nouveau_ramht.h"
 
 /* returns the size of fifo context */
@@ -10,12 +12,15 @@ nouveau_fifo_ctx_size(struct drm_device *dev)
         struct drm_nouveau_private *dev_priv = dev->dev_private;
 
         if (dev_priv->chipset >= 0x40)
-                return 128;
+                return 128 * 32;
         else
         if (dev_priv->chipset >= 0x17)
-                return 64;
+                return 64 * 32;
+        else
+        if (dev_priv->chipset >= 0x10)
+                return 32 * 32;
 
-        return 32;
+        return 32 * 16;
 }
 
 int nv04_instmem_init(struct drm_device *dev)
@@ -39,7 +44,7 @@ int nv04_instmem_init(struct drm_device *dev)
                 else if (nv44_graph_class(dev))     rsvd = 0x4980 * vs;
                 else                                rsvd = 0x4a40 * vs;
                 rsvd += 16 * 1024;
-                rsvd *= dev_priv->engine.fifo.channels;
+                rsvd *= 32; /* per-channel */
 
                 rsvd += 512 * 1024; /* pci(e)gart table */
                 rsvd += 512 * 1024; /* object storage */
@@ -67,7 +72,7 @@ int nv04_instmem_init(struct drm_device *dev)
                 return ret;
 
         /* And RAMFC */
-        length = dev_priv->engine.fifo.channels * nouveau_fifo_ctx_size(dev);
+        length = nouveau_fifo_ctx_size(dev);
         switch (dev_priv->card_type) {
         case NV_40:
                 offset = 0x20000;