Commit 09052863 authored Nov 15, 2017 by Christian König Committed by Alex Deucher Dec 06, 2017

drm/ttm: fix ttm_mem_evict_first once more



The code path isn't hit at the moment, but we need to take the lock to
add the BO back to the LRU.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Roger He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 31b8adab

drivers/gpu/drm/ttm/ttm_bo.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -793,10 +793,13 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
		spin_unlock(&glob->lru_lock);

		ret = ttm_bo_evict(bo, interruptible, no_wait_gpu);
		if (locked)
		if (locked) {
		ttm_bo_unreserve(bo);
		else
		} else {
		spin_lock(&glob->lru_lock);
		ttm_bo_add_to_lru(bo);
		spin_unlock(&glob->lru_lock);
		}

		kref_put(&bo->list_kref, ttm_bo_release_list);
		return ret;