[PATCH] drm/ttm: remove allow_errors from ttm_bo_force_list_clean

[Christian König]

From: Christian König <christian.koe...@amd.com>

That is completely nonsense. If we blindly continue we would end up
in an endless loop trying to evict the same BOs over and over again.

Signed-off-by: Christian König <christian.koenig at amd.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index e340d0d6..66c50ad 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1283,7 +1283,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;
@@ -1298,13 +1298,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);
@@ -1316,13 +1311,8 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device 
*bdev,
        if (fence) {
                ret = fence_wait(fence, false);
                fence_put(fence);
-               if (ret) {
-                       if (allow_errors) {
-                               return ret;
-                       } else {
-                               pr_err("Cleanup eviction failed\n");
-                       }
-               }
+               if (ret)
+                       return ret;
        }

        return 0;
@@ -1351,7 +1341,9 @@ 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 (%d)\n", ret);

                ret = (*man->func->takedown)(man);
        }
@@ -1374,7 +1366,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);

-- 
2.5.0