1 files changed, 6 insertions, 26 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 2e3c6caa97ee..82581e600dcd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -28,6 +28,7 @@
 #include "drm.h"
 #include "nouveau_drv.h"
 #include "nouveau_dma.h"
+#include "nouveau_ramht.h"
 
 void
 nouveau_dma_pre_init(struct nouveau_channel *chan)
@@ -58,26 +59,17 @@ nouveau_dma_init(struct nouveau_channel *chan)
 {
         struct drm_device *dev = chan->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_gpuobj *m2mf = NULL;
-        struct nouveau_gpuobj *nvsw = NULL;
+        struct nouveau_gpuobj *obj = NULL;
         int ret, i;
 
         /* Create NV_MEMORY_TO_MEMORY_FORMAT for buffer moves */
         ret = nouveau_gpuobj_gr_new(chan, dev_priv->card_type < NV_50 ?
-                                    0x0039 : 0x5039, &m2mf);
+                                    0x0039 : 0x5039, &obj);
         if (ret)
                 return ret;
 
-        ret = nouveau_gpuobj_ref_add(dev, chan, NvM2MF, m2mf, NULL);
-        if (ret)
-                return ret;
-
-        /* Create an NV_SW object for various sync purposes */
-        ret = nouveau_gpuobj_sw_new(chan, NV_SW, &nvsw);
-        if (ret)
-                return ret;
-
-        ret = nouveau_gpuobj_ref_add(dev, chan, NvSw, nvsw, NULL);
+        ret = nouveau_ramht_insert(chan, NvM2MF, obj);
+        nouveau_gpuobj_ref(NULL, &obj);
         if (ret)
                 return ret;
 
@@ -91,11 +83,6 @@ nouveau_dma_init(struct nouveau_channel *chan)
         if (ret)
                 return ret;
 
-        /* Map M2MF notifier object - fbcon. */
-        ret = nouveau_bo_map(chan->notifier_bo);
-        if (ret)
-                return ret;
-
         /* Insert NOPS for NOUVEAU_DMA_SKIPS */
         ret = RING_SPACE(chan, NOUVEAU_DMA_SKIPS);
         if (ret)
@@ -113,13 +100,6 @@ nouveau_dma_init(struct nouveau_channel *chan)
         BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1);
         OUT_RING(chan, NvNotify0);
 
-        /* Initialise NV_SW */
-        ret = RING_SPACE(chan, 2);
-        if (ret)
-                return ret;
-        BEGIN_RING(chan, NvSubSw, 0, 1);
-        OUT_RING(chan, NvSw);
-
         /* Sit back and pray the channel works.. */
         FIRE_RING(chan);
 
@@ -217,7 +197,7 @@ nv50_dma_push_wait(struct nouveau_channel *chan, int count)
 
                 chan->dma.ib_free = get - chan->dma.ib_put;
                 if (chan->dma.ib_free <= 0)
-                        chan->dma.ib_free += chan->dma.ib_max + 1;
+                        chan->dma.ib_free += chan->dma.ib_max;
         }
 
         return 0;