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

Commit 64798817 authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Synchronize buffer object moves in hardware. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0c6c1c2f

drivers/gpu/drm/nouveau/nouveau_bo.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -454,10 +454,15 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL,

	if (nvbo->channel) {

					evict || (nvbo->channel &&

		ret = nouveau_fence_sync(fence, nvbo->channel);

						  nvbo->channel != chan),

		if (ret)

			goto out;

	}



	ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, NULL, evict,

					no_wait_reserve, no_wait_gpu, new_mem);

					no_wait_reserve, no_wait_gpu, new_mem);

out:

	nouveau_fence_unref((void *)&fence);

	nouveau_fence_unref((void *)&fence);

	return ret;

	return ret;

}

}