Commit 12b68474 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/nouveau/ttm: handle ttm moves properly. 



The idea is to flip the core over to calling the driver always,
so add support for moves here.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200924051845.397177-6-airlied@gmail.com
parent dac4ec77

drivers/gpu/drm/nouveau/nouveau_bo.c

+12 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,18 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
		goto out;

	}



	if (old_reg->mem_type == TTM_PL_SYSTEM &&

	    new_reg->mem_type == TTM_PL_TT) {

		ttm_bo_move_null(bo, new_reg);

		goto out;

	}



	if (old_reg->mem_type == TTM_PL_TT &&

	    new_reg->mem_type == TTM_PL_SYSTEM) {

		ret = ttm_bo_move_ttm(bo, ctx, new_reg);

		goto out;

	}



	/* Hardware assisted copy. */

	if (drm->ttm.move) {

		if (new_reg->mem_type == TTM_PL_SYSTEM)