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>

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 07d9c6e..7c1eac4 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -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;