drm/ttm: make unlocking in ttm_bo_cleanup_refs optional v3

Needed for the next patch.

v2: actually predicate all unlocks
v3: add some cleanups suggested by Michel.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@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 db0f670911ecdcc1cd5c53945ffd583106c8d7f6..3aa63c4679f0db3b012806be76f704d5912d3494 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -486,20 +486,21 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)
 }
 
 /**
- * function ttm_bo_cleanup_refs_and_unlock
+ * function ttm_bo_cleanup_refs
  * If bo idle, remove from delayed- and lru lists, and unref.
  * If not idle, do nothing.
  *
  * Must be called with lru_lock and reservation held, this function
- * will drop both before returning.
+ * will drop the lru lock and optionally the reservation lock before returning.
  *
  * @interruptible         Any sleeps should occur interruptibly.
  * @no_wait_gpu           Never wait for gpu. Return -EBUSY instead.
+ * @unlock_resv           Unlock the reservation lock as well.
  */
 
-static int ttm_bo_cleanup_refs_and_unlock(struct ttm_buffer_object *bo,
-                                         bool interruptible,
-                                         bool no_wait_gpu)
+static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo,
+                              bool interruptible, bool no_wait_gpu,
+                              bool unlock_resv)
 {
        struct ttm_bo_global *glob = bo->glob;
        struct reservation_object *resv;
@@ -518,7 +519,8 @@ static int ttm_bo_cleanup_refs_and_unlock(struct ttm_buffer_object *bo,
        if (ret && !no_wait_gpu) {
                long lret;
 
-               reservation_object_unlock(bo->resv);
+               if (unlock_resv)
+                       reservation_object_unlock(bo->resv);
                spin_unlock(&glob->lru_lock);
 
                lret = reservation_object_wait_timeout_rcu(resv, true,
@@ -531,24 +533,24 @@ static int ttm_bo_cleanup_refs_and_unlock(struct ttm_buffer_object *bo,
                        return -EBUSY;
 
                spin_lock(&glob->lru_lock);
-               ret = reservation_object_trylock(bo->resv) ? 0 : -EBUSY;
-
-               /*
-                * We raced, and lost, someone else holds the reservation now,
-                * and is probably busy in ttm_bo_cleanup_memtype_use.
-                *
-                * Even if it's not the case, because we finished waiting any
-                * delayed destruction would succeed, so just return success
-                * here.
-                */
-               if (ret) {
+               if (unlock_resv && !reservation_object_trylock(bo->resv)) {
+                       /*
+                        * We raced, and lost, someone else holds the reservation now,
+                        * and is probably busy in ttm_bo_cleanup_memtype_use.
+                        *
+                        * Even if it's not the case, because we finished waiting any
+                        * delayed destruction would succeed, so just return success
+                        * here.
+                        */
                        spin_unlock(&glob->lru_lock);
                        return 0;
                }
+               ret = 0;
        }
 
        if (ret || unlikely(list_empty(&bo->ddestroy))) {
-               reservation_object_unlock(bo->resv);
+               if (unlock_resv)
+                       reservation_object_unlock(bo->resv);
                spin_unlock(&glob->lru_lock);
                return ret;
        }
@@ -559,7 +561,9 @@ static int ttm_bo_cleanup_refs_and_unlock(struct ttm_buffer_object *bo,
 
        spin_unlock(&glob->lru_lock);
        ttm_bo_cleanup_memtype_use(bo);
-       reservation_object_unlock(bo->resv);
+
+       if (unlock_resv)
+               reservation_object_unlock(bo->resv);
 
        return 0;
 }
@@ -600,8 +604,8 @@ static int ttm_bo_delayed_delete(struct ttm_bo_device *bdev, bool remove_all)
                }
 
                if (!ret)
-                       ret = ttm_bo_cleanup_refs_and_unlock(entry, false,
-                                                            !remove_all);
+                       ret = ttm_bo_cleanup_refs(entry, false, !remove_all,
+                                                 true);
                else
                        spin_unlock(&glob->lru_lock);
 
@@ -770,8 +774,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
        kref_get(&bo->list_kref);
 
        if (!list_empty(&bo->ddestroy)) {
-               ret = ttm_bo_cleanup_refs_and_unlock(bo, interruptible,
-                                                    no_wait_gpu);
+               ret = ttm_bo_cleanup_refs(bo, interruptible, no_wait_gpu, true);
                kref_put(&bo->list_kref, ttm_bo_release_list);
                return ret;
        }
@@ -1735,7 +1738,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
        kref_get(&bo->list_kref);
 
        if (!list_empty(&bo->ddestroy)) {
-               ret = ttm_bo_cleanup_refs_and_unlock(bo, false, false);
+               ret = ttm_bo_cleanup_refs(bo, false, false, true);
                kref_put(&bo->list_kref, ttm_bo_release_list);
                return ret;
        }