[PATCH 01/13] ttm: abstruct evictable bo

[Chunming Zhou]

Change-Id: Ie81985282fab1e564fc2948109fae2173613b465
Signed-off-by: Chunming Zhou <david1.z...@amd.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 98e06f8bf23b..15506682a0be 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -704,22 +704,20 @@ static bool ttm_bo_evict_swapout_allowable(struct 
ttm_buffer_object *bo,
        return ret;
 }
 
-static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
-                              uint32_t mem_type,
-                              const struct ttm_place *place,
-                              struct ttm_operation_ctx *ctx)
+static struct ttm_buffer_object *
+ttm_mem_get_evictable_bo(struct ttm_bo_device *bdev,
+                        uint32_t mem_type,
+                        const struct ttm_place *place,
+                        struct ttm_operation_ctx *ctx,
+                        bool *locked)
 {
-       struct ttm_bo_global *glob = bdev->glob;
-       struct ttm_mem_type_manager *man = &bdev->man[mem_type];
        struct ttm_buffer_object *bo = NULL;
-       bool locked = false;
-       unsigned i;
-       int ret;
+       struct ttm_mem_type_manager *man = &bdev->man[mem_type];
+       int i;
 
-       spin_lock(&glob->lru_lock);
        for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
                list_for_each_entry(bo, &man->lru[i], lru) {
-                       if (!ttm_bo_evict_swapout_allowable(bo, ctx, &locked))
+                       if (!ttm_bo_evict_swapout_allowable(bo, ctx, locked))
                                continue;
 
                        if (place && !bdev->driver->eviction_valuable(bo,
@@ -738,6 +736,21 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
                bo = NULL;
        }
 
+       return bo;
+}
+
+static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
+                              uint32_t mem_type,
+                              const struct ttm_place *place,
+                              struct ttm_operation_ctx *ctx)
+{
+       struct ttm_bo_global *glob = bdev->glob;
+       struct ttm_buffer_object *bo = NULL;
+       bool locked = false;
+       int ret;
+
+       spin_lock(&glob->lru_lock);
+       bo = ttm_mem_get_evictable_bo(bdev, mem_type, place, ctx, &locked);
        if (!bo) {
                spin_unlock(&glob->lru_lock);
                return -EBUSY;
-- 
2.14.1

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