drm/nv50: simplify bo moves now that they're all through the vm

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

2 files changed, 15 insertions, 21 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 897c55509a6b..931dade12edd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -497,15 +497,6 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
         return ret;
 }
 
-static inline uint32_t
-nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
-                      struct nouveau_channel *chan, struct ttm_mem_reg *mem)
-{
-        if (mem->mem_type == TTM_PL_TT)
-                return chan->gart_handle;
-        return chan->vram_handle;
-}
-
 static int
 nvc0_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
                   struct ttm_mem_reg *old_mem, struct ttm_mem_reg *new_mem)
@@ -579,14 +570,6 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
         else
                 dst_offset += dev_priv->gart_info.aper_base;
 
-        ret = RING_SPACE(chan, 3);
-        if (ret)
-                return ret;
-
-        BEGIN_RING(chan, NvSubM2MF, 0x0184, 2);
-        OUT_RING  (chan, nouveau_bo_mem_ctxdma(bo, chan, old_mem));
-        OUT_RING  (chan, nouveau_bo_mem_ctxdma(bo, chan, new_mem));
-
         while (length) {
                 u32 amount, stride, height;
 
@@ -666,6 +649,15 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
         return 0;
 }
 
+static inline uint32_t
+nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
+                      struct nouveau_channel *chan, struct ttm_mem_reg *mem)
+{
+        if (mem->mem_type == TTM_PL_TT)
+                return chan->gart_handle;
+        return chan->vram_handle;
+}
+
 static int
 nv04_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
                   struct ttm_mem_reg *old_mem, struct ttm_mem_reg *new_mem)
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 65699bfaaaea..1ef39be996ed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -96,13 +96,15 @@ nouveau_dma_init(struct nouveau_channel *chan)
                 OUT_RING(chan, 0);
 
         /* Initialise NV_MEMORY_TO_MEMORY_FORMAT */
-        ret = RING_SPACE(chan, 4);
+        ret = RING_SPACE(chan, 6);
         if (ret)
                 return ret;
         BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_NAME, 1);
-        OUT_RING(chan, NvM2MF);
-        BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1);
-        OUT_RING(chan, NvNotify0);
+        OUT_RING  (chan, NvM2MF);
+        BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 3);
+        OUT_RING  (chan, NvNotify0);
+        OUT_RING  (chan, chan->vram_handle);
+        OUT_RING  (chan, chan->gart_handle);
 
         /* Sit back and pray the channel works.. */
         FIRE_RING(chan);