drm/nve0/ttm: implement buffer moves with weirdo pcopy-on-pgraph methods

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 4435e115b9291401f37c55a0025bf8a5fed2d36b..1da403123eca615c683548b6243ce34d814703c4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -488,6 +488,27 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
        return ret;
 }
 
+static int
+nve0_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
+                 struct ttm_mem_reg *old_mem, struct ttm_mem_reg *new_mem)
+{
+       struct nouveau_mem *node = old_mem->mm_node;
+       int ret = RING_SPACE(chan, 10);
+       if (ret == 0) {
+               BEGIN_NVC0(chan, 2, NvSubCopy, 0x0400, 8);
+               OUT_RING  (chan, upper_32_bits(node->vma[0].offset));
+               OUT_RING  (chan, lower_32_bits(node->vma[0].offset));
+               OUT_RING  (chan, upper_32_bits(node->vma[1].offset));
+               OUT_RING  (chan, lower_32_bits(node->vma[1].offset));
+               OUT_RING  (chan, PAGE_SIZE);
+               OUT_RING  (chan, PAGE_SIZE);
+               OUT_RING  (chan, PAGE_SIZE);
+               OUT_RING  (chan, new_mem->num_pages);
+               BEGIN_NVC0(chan, 8, NvSubCopy, 0x0300, 0x0386);
+       }
+       return ret;
+}
+
 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)
@@ -727,7 +748,10 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
        if (dev_priv->card_type < NV_C0)
                ret = nv50_bo_move_m2mf(chan, bo, &bo->mem, new_mem);
        else
+       if (dev_priv->card_type < NV_E0)
                ret = nvc0_bo_move_m2mf(chan, bo, &bo->mem, new_mem);
+       else
+               ret = nve0_bo_move_copy(chan, bo, &bo->mem, new_mem);
        if (ret == 0) {
                ret = nouveau_bo_move_accel_cleanup(chan, nvbo, evict,
                                                    no_wait_reserve,

diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index 47896c407284f2670fcefaf349040b5f1c29c40b..f776b6af96408e231c2d170ba192cfa865c42e6d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -53,6 +53,7 @@ enum {
        NvSubCtxSurf2D  = 2,
        NvSub2D         = 3,
        NvSubGdiRect    = 3,
+       NvSubCopy       = 4,
        NvSubImageBlit  = 4
 };
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 2dd7187b08d35a49a954ceeae2c973ec0aaa5b5f..78fb2cbeea23fcbe0ae1c076c1130300a089c0c1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -657,6 +657,20 @@ nouveau_card_channel_init(struct drm_device *dev)
 
                BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0000, 1);
                OUT_RING  (chan, 0x00009039);
+       } else
+       if (dev_priv->card_type <= NV_E0) {
+               /* not used, but created to get a graph context */
+               ret = nouveau_gpuobj_gr_new(chan, 0xa040, 0xa040);
+               if (ret)
+                       goto error;
+
+               /* bind strange copy engine to subchannel 4 (fixed...) */
+               ret = RING_SPACE(chan, 2);
+               if (ret)
+                       goto error;
+
+               BEGIN_NVC0(chan, 2, NvSubCopy, 0x0000, 1);
+               OUT_RING  (chan, 0x0000a0b5);
        }
 
        FIRE_RING (chan);