niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/nouveau/ttm: use multihop

Browse source 
This removes the code to move resources directly between
SYSTEM and VRAM in favour of using the core ttm mulithop code.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201109005432.861936-4-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-10-29 13:59:20 +10:00
parent f5a89a5cae
commit 0c8c0659d7
1 changed files with 13 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
drivers/gpu/drm/nouveau/nouveau_bo.c
View file

@ -861,96 +861,6 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
NV_INFO(drm, "MM: using %s for buffer copies\n", name); NV_INFO(drm, "MM: using %s for buffer copies\n", name);
} }
static int
nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict,
struct ttm_operation_ctx *ctx,
struct ttm_resource *new_reg)
{
struct ttm_place placement_memtype = {
.fpfn = 0,
.lpfn = 0,
.mem_type = TTM_PL_TT,
.flags = 0
};
struct ttm_placement placement;
struct ttm_resource tmp_reg;
int ret;
placement.num_placement = placement.num_busy_placement = 1;
placement.placement = placement.busy_placement = &placement_memtype;
tmp_reg = *new_reg;
tmp_reg.mm_node = NULL;
ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
if (ret)
return ret;
ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
if (ret)
goto out;
ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg);
if (ret)
goto out;
ret = nouveau_bo_move_m2mf(bo, true, ctx, &tmp_reg);
if (ret)
goto out;
ret = ttm_bo_wait_ctx(bo, ctx);
if (ret)
goto out;
nouveau_ttm_tt_unbind(bo->bdev, bo->ttm);
ttm_resource_free(bo, &bo->mem);
ttm_bo_assign_mem(bo, &tmp_reg);
out:
ttm_resource_free(bo, &tmp_reg);
return ret;
}
static int
nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict,
struct ttm_operation_ctx *ctx,
struct ttm_resource *new_reg)
{
struct ttm_place placement_memtype = {
.fpfn = 0,
.lpfn = 0,
.mem_type = TTM_PL_TT,
.flags = 0
};
struct ttm_placement placement;
struct ttm_resource tmp_reg;
int ret;
placement.num_placement = placement.num_busy_placement = 1;
placement.placement = placement.busy_placement = &placement_memtype;
tmp_reg = *new_reg;
tmp_reg.mm_node = NULL;
ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
if (ret)
return ret;
ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
if (unlikely(ret != 0))
return ret;
ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg);
if (unlikely(ret != 0))
return ret;
ttm_bo_assign_mem(bo, &tmp_reg);
ret = nouveau_bo_move_m2mf(bo, true, ctx, new_reg);
if (ret)
goto out;
out:
ttm_resource_free(bo, &tmp_reg);
return ret;
}
static void static void
nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict, nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict,
struct ttm_resource *new_reg) struct ttm_resource *new_reg)
@ -1032,6 +942,17 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
struct nouveau_drm_tile *new_tile = NULL; struct nouveau_drm_tile *new_tile = NULL;
int ret = 0; int ret = 0;
if ((old_reg->mem_type == TTM_PL_SYSTEM &&
new_reg->mem_type == TTM_PL_VRAM) ||
(old_reg->mem_type == TTM_PL_VRAM &&
new_reg->mem_type == TTM_PL_SYSTEM)) {
hop->fpfn = 0;
hop->lpfn = 0;
hop->mem_type = TTM_PL_TT;
hop->flags = 0;
return -EMULTIHOP;
}
if (new_reg->mem_type == TTM_PL_TT) { if (new_reg->mem_type == TTM_PL_TT) {
ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, new_reg); ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, new_reg);
if (ret) if (ret)
@ -1074,15 +995,8 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
/* Hardware assisted copy. */ /* Hardware assisted copy. */
if (drm->ttm.move) { if (drm->ttm.move) {
if (new_reg->mem_type == TTM_PL_SYSTEM) ret = nouveau_bo_move_m2mf(bo, evict, ctx,
ret = nouveau_bo_move_flipd(bo, evict, ctx, new_reg);
new_reg);
else if (old_reg->mem_type == TTM_PL_SYSTEM)
ret = nouveau_bo_move_flips(bo, evict, ctx,
new_reg);
else
ret = nouveau_bo_move_m2mf(bo, evict, ctx,
new_reg);
if (!ret) if (!ret)
goto out; goto out;
} }