Commit c6b7e895 authored by Ben Skeggs's avatar Ben Skeggs

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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f1c65e7c
...@@ -488,6 +488,27 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan, ...@@ -488,6 +488,27 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
return ret; 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 static int
nvc0_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 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) 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, ...@@ -727,7 +748,10 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
if (dev_priv->card_type < NV_C0) if (dev_priv->card_type < NV_C0)
ret = nv50_bo_move_m2mf(chan, bo, &bo->mem, new_mem); ret = nv50_bo_move_m2mf(chan, bo, &bo->mem, new_mem);
else else
if (dev_priv->card_type < NV_E0)
ret = nvc0_bo_move_m2mf(chan, bo, &bo->mem, new_mem); 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) { if (ret == 0) {
ret = nouveau_bo_move_accel_cleanup(chan, nvbo, evict, ret = nouveau_bo_move_accel_cleanup(chan, nvbo, evict,
no_wait_reserve, no_wait_reserve,
......
...@@ -53,6 +53,7 @@ enum { ...@@ -53,6 +53,7 @@ enum {
NvSubCtxSurf2D = 2, NvSubCtxSurf2D = 2,
NvSub2D = 3, NvSub2D = 3,
NvSubGdiRect = 3, NvSubGdiRect = 3,
NvSubCopy = 4,
NvSubImageBlit = 4 NvSubImageBlit = 4
}; };
......
...@@ -657,6 +657,20 @@ nouveau_card_channel_init(struct drm_device *dev) ...@@ -657,6 +657,20 @@ nouveau_card_channel_init(struct drm_device *dev)
BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0000, 1); BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0000, 1);
OUT_RING (chan, 0x00009039); 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); FIRE_RING (chan);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment