nouveau: NV04 PFIFO engtab functions
authorBen Skeggs <skeggsb@gmail.com>
Sun, 24 Jun 2007 08:57:09 +0000 (18:57 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Sun, 24 Jun 2007 08:57:09 +0000 (18:57 +1000)
linux-core/Makefile.kernel
linux-core/nv04_fifo.c [new symlink]
shared-core/nouveau_drv.h
shared-core/nouveau_fifo.c
shared-core/nouveau_reg.h
shared-core/nouveau_state.c
shared-core/nv04_fifo.c [new file with mode: 0644]
shared-core/nv40_fifo.c

index 3e78b6d..45d2dc4 100644 (file)
@@ -25,7 +25,7 @@ nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
                nv04_timer.o \
                nv04_mc.o nv40_mc.o \
                nv04_fb.o nv10_fb.o nv40_fb.o \
-               nv40_fifo.o \
+               nv04_fifo.o nv40_fifo.o \
                nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \
                nv40_graph.o
 radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
diff --git a/linux-core/nv04_fifo.c b/linux-core/nv04_fifo.c
new file mode 120000 (symlink)
index 0000000..d10beb1
--- /dev/null
@@ -0,0 +1 @@
+../shared-core/nv04_fifo.c
\ No newline at end of file
index 07c4010..3e32c2d 100644 (file)
@@ -255,6 +255,12 @@ extern void nv10_fb_takedown(drm_device_t *dev);
 extern int  nv40_fb_init(drm_device_t *dev);
 extern void nv40_fb_takedown(drm_device_t *dev);
 
+/* nv04_fifo.c */
+extern int  nv04_fifo_create_context(drm_device_t *dev, int channel);
+extern void nv04_fifo_destroy_context(drm_device_t *dev, int channel);
+extern int  nv04_fifo_load_context(drm_device_t *dev, int channel);
+extern int  nv04_fifo_save_context(drm_device_t *dev, int channel);
+
 /* nv40_fifo.c */
 extern int  nv40_fifo_create_context(drm_device_t *, int channel);
 extern void nv40_fifo_destroy_context(drm_device_t *, int channel);
index 527a71a..58408a1 100644 (file)
@@ -238,34 +238,6 @@ nouveau_fifo_cmdbuf_alloc(struct drm_device *dev, int channel)
        return 0;
 }
 
-#define RAMFC_WR(offset, val) NV_WRITE(fifoctx + NV04_RAMFC_##offset, (val))
-static void nouveau_nv04_context_init(drm_device_t *dev, int channel)
-{
-        drm_nouveau_private_t *dev_priv = dev->dev_private;
-       struct nouveau_object *cb_obj;
-       uint32_t fifoctx, ctx_size = 32;
-       int i;
-
-       cb_obj = dev_priv->fifos[channel].cmdbuf_obj;
-
-       fifoctx=NV_RAMIN+dev_priv->ramfc_offset+channel*ctx_size;
-       
-        // clear the fifo context
-        for(i=0;i<ctx_size/4;i++)
-                NV_WRITE(fifoctx+4*i,0x0);
-
-       RAMFC_WR(DMA_INSTANCE   , nouveau_chip_instance_get(dev, cb_obj->instance));
-
-        RAMFC_WR(DMA_FETCH,    NV_PFIFO_CACHE1_DMA_FETCH_TRIG_112_BYTES |
-                                NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
-                                NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4     |
-#ifdef __BIG_ENDIAN
-                                NV_PFIFO_CACHE1_BIG_ENDIAN |
-#endif
-                               0x00000000);
-}
-#undef RAMFC_WR
-
 #define RAMFC_WR(offset, val) NV_WRITE(fifoctx + NV10_RAMFC_##offset, (val))
 static void nouveau_nv10_context_init(drm_device_t *dev, int channel)
 {
@@ -488,10 +460,6 @@ static int nouveau_fifo_alloc(drm_device_t* dev, int *chan_ret, DRMFILE filp)
 
        /* Construct inital RAMFC for new channel */
        switch (dev_priv->card_type) {
-       case NV_04:
-       case NV_05:
-               nouveau_nv04_context_init(dev, channel);
-               break;
        case NV_10:
        case NV_17:
                nouveau_nv10_context_init(dev, channel);
index 07c54a9..ba61f99 100644 (file)
 #define NV10_PFIFO_CACHE1_SEMAPHORE                        0x0000326C
 #define NV03_PFIFO_CACHE1_GET                              0x00003270
 #define NV04_PFIFO_CACHE1_ENGINE                           0x00003280
-#define NV10_PFIFO_CACHE1_DMA_DCOUNT                       0x000032A0
+#define NV04_PFIFO_CACHE1_DMA_DCOUNT                       0x000032A0
 #define NV40_PFIFO_GRCTX_INSTANCE                          0x000032E0
 #define NV40_PFIFO_UNK32E4                                 0x000032E4
 #define NV04_PFIFO_CACHE1_METHOD(i)                (0x00003800+(i*8))
 #define NV04_RAMFC_DMA_PUT                                       0x00
 #define NV04_RAMFC_DMA_GET                                       0x04
 #define NV04_RAMFC_DMA_INSTANCE                                  0x08
+#define NV04_RAMFC_DMA_STATE                                     0x0C
 #define NV04_RAMFC_DMA_FETCH                                     0x10
+#define NV04_RAMFC_ENGINE                                        0x14
+#define NV04_RAMFC_PULL1_ENGINE                                  0x18
 
 #define NV10_RAMFC_DMA_PUT                                       0x00
 #define NV10_RAMFC_DMA_GET                                       0x04
index d113f23..ed200e8 100644 (file)
@@ -90,6 +90,10 @@ static int nouveau_init_engine_ptrs(drm_device_t *dev)
                engine->graph.takedown  = nv04_graph_takedown;
                engine->fifo.init       = nouveau_fifo_init;
                engine->fifo.takedown   = nouveau_stub_takedown;
+               engine->fifo.create_context     = nv04_fifo_create_context;
+               engine->fifo.destroy_context    = nv04_fifo_destroy_context;
+               engine->fifo.load_context       = nv04_fifo_load_context;
+               engine->fifo.save_context       = nv04_fifo_save_context;
                break;
        case 0x10:
                engine->mc.init         = nv04_mc_init;
diff --git a/shared-core/nv04_fifo.c b/shared-core/nv04_fifo.c
new file mode 100644 (file)
index 0000000..34a497b
--- /dev/null
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
+ * All Rights Reserved.
+ *
+ * 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 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.
+ *
+ */
+
+#include "drmP.h"
+#include "drm.h"
+#include "nouveau_drv.h"
+
+#define NV04_RAMFC (NV_RAMIN + dev_priv->ramfc_offset)
+#define RAMFC_WR(offset, val) NV_WRITE(fifoctx + NV04_RAMFC_##offset, (val))
+#define RAMFC_RD(offset)      NV_READ(fifoctx + NV04_RAMFC_##offset)
+#define NV04_FIFO_CONTEXT_SIZE 32
+
+int
+nv04_fifo_create_context(drm_device_t *dev, int channel)
+{
+       drm_nouveau_private_t *dev_priv = dev->dev_private;
+       struct nouveau_fifo *chan = &dev_priv->fifos[channel];
+       struct nouveau_object *pb = chan->cmdbuf_obj;
+       int fifoctx = NV04_RAMFC + (channel * NV04_FIFO_CONTEXT_SIZE);
+       int i;
+
+       if (!pb || !pb->instance)
+               return DRM_ERR(EINVAL);
+
+       /* Clear RAMFC */
+       for (i=0; i<NV04_FIFO_CONTEXT_SIZE; i+=4)
+               NV_WRITE(fifoctx + i, 0);
+       
+       /* Setup initial state */
+       RAMFC_WR(DMA_PUT, chan->pushbuf_base);
+       RAMFC_WR(DMA_GET, chan->pushbuf_base);
+       RAMFC_WR(DMA_INSTANCE, nouveau_chip_instance_get(dev, pb->instance));
+       /* NOTE: nvidia use TRIG_128/SIZE_128/MAX_REQS_8 */
+       RAMFC_WR(DMA_FETCH, (NV_PFIFO_CACHE1_DMA_FETCH_TRIG_112_BYTES |
+                            NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES |
+                            NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4 |
+#ifdef __BIG_ENDIAN
+                            NV_PFIFO_CACHE1_BIG_ENDIAN |
+#endif
+                            0));
+       return 0;
+}
+
+void
+nv04_fifo_destroy_context(drm_device_t *dev, int channel)
+{
+       drm_nouveau_private_t *dev_priv = dev->dev_private;
+       uint32_t fifoctx;
+       int i;
+
+       fifoctx = NV04_RAMFC + (channel * NV04_FIFO_CONTEXT_SIZE);
+       for (i=0; i<NV04_FIFO_CONTEXT_SIZE; i+=4)
+               NV_WRITE(fifoctx + i, 0);
+}
+
+int
+nv04_fifo_load_context(drm_device_t *dev, int channel)
+{
+       drm_nouveau_private_t *dev_priv = dev->dev_private;
+       int fifoctx = NV04_RAMFC + (channel * NV04_FIFO_CONTEXT_SIZE);
+       uint32_t tmp;
+
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_PUT, RAMFC_RD(DMA_PUT));
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_GET, RAMFC_RD(DMA_GET));
+       
+       tmp = RAMFC_RD(DMA_INSTANCE);
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_INSTANCE, tmp & 0xFFFF);
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_DCOUNT, tmp >> 16);
+       
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_STATE, RAMFC_RD(DMA_STATE));
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_FETCH, RAMFC_RD(DMA_FETCH));
+       NV_WRITE(NV04_PFIFO_CACHE1_ENGINE, RAMFC_RD(ENGINE));
+       NV_WRITE(NV04_PFIFO_CACHE1_PULL1, RAMFC_RD(PULL1_ENGINE));
+
+       /* Reset NV04_PFIFO_CACHE1_DMA_CTL_AT_INFO to INVALID */
+       tmp = NV_READ(NV04_PFIFO_CACHE1_DMA_CTL) & ~(1<<31);
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_CTL, tmp);
+
+       return 0;
+}
+
+int
+nv04_fifo_save_context(drm_device_t *dev, int channel)
+{
+       drm_nouveau_private_t *dev_priv = dev->dev_private;
+       int fifoctx = NV04_RAMFC + (channel * NV04_FIFO_CONTEXT_SIZE);
+       uint32_t tmp;
+
+       RAMFC_WR(DMA_PUT, NV04_PFIFO_CACHE1_DMA_PUT);
+       RAMFC_WR(DMA_GET, NV04_PFIFO_CACHE1_DMA_GET);
+
+       tmp  = NV_READ(NV04_PFIFO_CACHE1_DMA_DCOUNT) << 16;
+       tmp |= NV_READ(NV04_PFIFO_CACHE1_DMA_INSTANCE);
+       RAMFC_WR(DMA_INSTANCE, tmp);
+
+       RAMFC_WR(DMA_STATE, NV_READ(NV04_PFIFO_CACHE1_DMA_STATE));
+       RAMFC_WR(DMA_FETCH, NV_READ(NV04_PFIFO_CACHE1_DMA_FETCH));
+       RAMFC_WR(ENGINE, NV_READ(NV04_PFIFO_CACHE1_ENGINE));
+       RAMFC_WR(PULL1_ENGINE, NV_READ(NV04_PFIFO_CACHE1_PULL1));
+       
+       return 0;
+}
+
index b67a7e5..9d7afbe 100644 (file)
@@ -91,7 +91,7 @@ nv40_fifo_load_context(drm_device_t *dev, int channel)
        NV_WRITE(NV04_PFIFO_CACHE1_DMA_PUT          , RAMFC_RD(DMA_PUT));
        NV_WRITE(NV10_PFIFO_CACHE1_REF_CNT          , RAMFC_RD(REF_CNT));
        NV_WRITE(NV04_PFIFO_CACHE1_DMA_INSTANCE     , RAMFC_RD(DMA_INSTANCE));
-       NV_WRITE(NV10_PFIFO_CACHE1_DMA_DCOUNT       , RAMFC_RD(DMA_DCOUNT));
+       NV_WRITE(NV04_PFIFO_CACHE1_DMA_DCOUNT       , RAMFC_RD(DMA_DCOUNT));
        NV_WRITE(NV04_PFIFO_CACHE1_DMA_STATE        , RAMFC_RD(DMA_STATE));
 
        /* No idea what 0x2058 is.. */
@@ -152,7 +152,7 @@ nv40_fifo_save_context(drm_device_t *dev, int channel)
        RAMFC_WR(DMA_GET          , NV_READ(NV04_PFIFO_CACHE1_DMA_GET));
        RAMFC_WR(REF_CNT          , NV_READ(NV10_PFIFO_CACHE1_REF_CNT));
        RAMFC_WR(DMA_INSTANCE     , NV_READ(NV04_PFIFO_CACHE1_DMA_INSTANCE));
-       RAMFC_WR(DMA_DCOUNT       , NV_READ(NV10_PFIFO_CACHE1_DMA_DCOUNT));
+       RAMFC_WR(DMA_DCOUNT       , NV_READ(NV04_PFIFO_CACHE1_DMA_DCOUNT));
        RAMFC_WR(DMA_STATE        , NV_READ(NV04_PFIFO_CACHE1_DMA_STATE));
 
        tmp  = NV_READ(NV04_PFIFO_CACHE1_DMA_FETCH);