[PATCH 6/7] drm/ttm: add ttm_bo_evict_swapout_allowable to check bo is allowable to evict or swapout

[Roger He]

extract this function since eviction and swapout share same logic

Change-Id: I80a475a93fceed8d66d74a1832c815a0756341ac
Signed-off-by: Roger He <hongbo...@amd.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index e7595b4..313925c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -706,6 +706,23 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
 }
 EXPORT_SYMBOL(ttm_bo_eviction_valuable);
 
+static bool ttm_bo_evict_swapout_allowable(struct ttm_buffer_object *bo,
+                       struct ttm_operation_ctx *ctx, bool *locked)
+{
+       bool ret = false;
+
+       *locked = false;
+       if (bo->resv == ctx->resv) {
+               if (ctx->allow_reserved_eviction || !list_empty(&bo->ddestroy))
+                       ret = true;
+       } else {
+               *locked = reservation_object_trylock(bo->resv);
+               ret = *locked;
+       }
+
+       return ret;
+}
+
 static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
                               uint32_t mem_type,
                               const struct ttm_place *place,
@@ -721,21 +738,13 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
        spin_lock(&glob->lru_lock);
        for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
                list_for_each_entry(bo, &man->lru[i], lru) {
-                       if (bo->resv == ctx->resv) {
-                               if (!ctx->allow_reserved_eviction &&
-                                   list_empty(&bo->ddestroy))
-                                       continue;
-                       } else {
-                               locked = reservation_object_trylock(bo->resv);
-                               if (!locked)
-                                       continue;
-                       }
+                       if (!ttm_bo_evict_swapout_allowable(bo, ctx, &locked))
+                               continue;
 
                        if (place && !bdev->driver->eviction_valuable(bo,
                                                                      place)) {
                                if (locked)
                                        reservation_object_unlock(bo->resv);
-                               locked = false;
                                continue;
                        }
                        break;
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel