Commit b8a6a804 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: move check for no-op bo move before memcpy fallback 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f1ab0cc9

drivers/gpu/drm/nouveau/nouveau_bo.c

+6 −6
Original line number Diff line number Diff line
@@ -816,12 +816,6 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		return ret;



	/* Software copy if the card isn't up and running yet. */

	if (!dev_priv->channel) {

		ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);

		goto out;

	}



	/* Fake bo copy. */

	if (old_mem->mem_type == TTM_PL_SYSTEM && !bo->ttm) {

		BUG_ON(bo->mem.mm_node != NULL);
@@ -830,6 +824,12 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, 
		goto out;

	}



	/* Software copy if the card isn't up and running yet. */

	if (!dev_priv->channel) {

		ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);

		goto out;

	}



	/* Hardware assisted copy. */

	if (new_mem->mem_type == TTM_PL_SYSTEM)

		ret = nouveau_bo_move_flipd(bo, evict, intr, no_wait_reserve, no_wait_gpu, new_mem);