Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/nouveau: flips/flipd need to always set 'evict' for move_accel_cleanup() 



We free the temporary binding before leaving this function, so we also have
to wait for the move to actually complete.

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

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −3
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		goto out;



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

	ret = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, new_mem);

out:

	ttm_bo_mem_put(bo, &tmp_mem);

	return ret;
@@ -812,11 +812,11 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		return ret;



	ret = ttm_bo_move_ttm(bo, evict, no_wait_reserve, no_wait_gpu, &tmp_mem);

	ret = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, &tmp_mem);

	if (ret)

		goto out;



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

	ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_reserve, no_wait_gpu, new_mem);

	if (ret)

		goto out;