drm/ttm: remove allow_errors parameter from ttm_bo_force_list_clean

Not allowing errors here is completely pointless and actually dangerous
cause trying to continue on an error can cause an endless loop.

Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Christian König <christian.koenig@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 d4973e9c126e385e3f3bd6b68dc065b3f3ef2373..89bbcf0300f4d563f67c8d4dbb46ef5156bc26c8 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1291,7 +1291,7 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
 EXPORT_SYMBOL(ttm_bo_create);
 
 static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
-                                       unsigned mem_type, bool allow_errors)
+                                  unsigned mem_type)
 {
        struct ttm_mem_type_manager *man = &bdev->man[mem_type];
        struct ttm_bo_global *glob = bdev->glob;
@@ -1306,13 +1306,8 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
        while (!list_empty(&man->lru)) {
                spin_unlock(&glob->lru_lock);
                ret = ttm_mem_evict_first(bdev, mem_type, NULL, false, false);
-               if (ret) {
-                       if (allow_errors) {
-                               return ret;
-                       } else {
-                               pr_err("Cleanup eviction failed\n");
-                       }
-               }
+               if (ret)
+                       return ret;
                spin_lock(&glob->lru_lock);
        }
        spin_unlock(&glob->lru_lock);
@@ -1324,13 +1319,8 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
        if (fence) {
                ret = dma_fence_wait(fence, false);
                dma_fence_put(fence);
-               if (ret) {
-                       if (allow_errors) {
-                               return ret;
-                       } else {
-                               pr_err("Cleanup eviction failed\n");
-                       }
-               }
+               if (ret)
+                       return ret;
        }
 
        return 0;
@@ -1359,7 +1349,11 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
 
        ret = 0;
        if (mem_type > 0) {
-               ttm_bo_force_list_clean(bdev, mem_type, false);
+               ret = ttm_bo_force_list_clean(bdev, mem_type);
+               if (ret) {
+                       pr_err("Cleanup eviction failed\n");
+                       return ret;
+               }
 
                ret = (*man->func->takedown)(man);
        }
@@ -1382,7 +1376,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
                return 0;
        }
 
-       return ttm_bo_force_list_clean(bdev, mem_type, true);
+       return ttm_bo_force_list_clean(bdev, mem_type);
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);