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

Commit 7bc17a78 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm/ttm: Fix a theoretical race 



The ttm_mem_evict_first function could theoretically drop the
lru lock without retrying if a reservation from off the LRU list
ended up waiting.
However, since currently there are no users that could cause a wait
in that situation so this is not suitable for stable

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a16d4f86

drivers/gpu/drm/ttm/ttm_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -817,11 +817,11 @@ retry: 
		goto retry;

	}



	ret = ttm_bo_reserve_locked(bo, false, no_wait_reserve, false, 0);

	ret = ttm_bo_reserve_locked(bo, false, true, false, 0);



	if (unlikely(ret == -EBUSY)) {

		spin_unlock(&glob->lru_lock);

		if (likely(!no_wait_gpu))

		if (likely(!no_wait_reserve))

			ret = ttm_bo_wait_unreserved(bo, interruptible);



		kref_put(&bo->list_kref, ttm_bo_release_list);