drm/ttm: make ttm reservation calls behave like reservation calls

This commit converts the source of the val_seq counter to
the ww_mutex api. The reservation objects are converted later,
because there is still a lockdep splat in nouveau that has to
resolved first.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 30 insertions, 28 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c
index 7b90def15674..efcb734e5543 100644
--- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c
+++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c
@@ -32,7 +32,8 @@
 #include <linux/sched.h>
 #include <linux/module.h>
 
-static void ttm_eu_backoff_reservation_locked(struct list_head *list)
+static void ttm_eu_backoff_reservation_locked(struct list_head *list,
+                                              struct ww_acquire_ctx *ticket)
 {
         struct ttm_validate_buffer *entry;
 
@@ -41,14 +42,15 @@ static void ttm_eu_backoff_reservation_locked(struct list_head *list)
                 if (!entry->reserved)
                         continue;
 
+                entry->reserved = false;
                 if (entry->removed) {
-                        ttm_bo_add_to_lru(bo);
+                        ttm_bo_unreserve_ticket_locked(bo, ticket);
                         entry->removed = false;
 
+                } else {
+                        atomic_set(&bo->reserved, 0);
+                        wake_up_all(&bo->event_queue);
                 }
-                entry->reserved = false;
-                atomic_set(&bo->reserved, 0);
-                wake_up_all(&bo->event_queue);
         }
 }
 
@@ -82,7 +84,8 @@ static void ttm_eu_list_ref_sub(struct list_head *list)
         }
 }
 
-void ttm_eu_backoff_reservation(struct list_head *list)
+void ttm_eu_backoff_reservation(struct ww_acquire_ctx *ticket,
+                                struct list_head *list)
 {
         struct ttm_validate_buffer *entry;
         struct ttm_bo_global *glob;
@@ -93,7 +96,8 @@ void ttm_eu_backoff_reservation(struct list_head *list)
         entry = list_first_entry(list, struct ttm_validate_buffer, head);
         glob = entry->bo->glob;
         spin_lock(&glob->lru_lock);
-        ttm_eu_backoff_reservation_locked(list);
+        ttm_eu_backoff_reservation_locked(list, ticket);
+        ww_acquire_fini(ticket);
         spin_unlock(&glob->lru_lock);
 }
 EXPORT_SYMBOL(ttm_eu_backoff_reservation);
@@ -110,12 +114,12 @@ EXPORT_SYMBOL(ttm_eu_backoff_reservation);
  * buffers in different orders.
  */
 
-int ttm_eu_reserve_buffers(struct list_head *list)
+int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
+                           struct list_head *list)
 {
         struct ttm_bo_global *glob;
         struct ttm_validate_buffer *entry;
         int ret;
-        uint32_t val_seq;
 
         if (list_empty(list))
                 return 0;
@@ -129,8 +133,8 @@ int ttm_eu_reserve_buffers(struct list_head *list)
         entry = list_first_entry(list, struct ttm_validate_buffer, head);
         glob = entry->bo->glob;
 
+        ww_acquire_init(ticket, &reservation_ww_class);
         spin_lock(&glob->lru_lock);
-        val_seq = entry->bo->bdev->val_seq++;
 
 retry:
         list_for_each_entry(entry, list, head) {
@@ -140,7 +144,7 @@ retry:
                 if (entry->reserved)
                         continue;
 
-                ret = ttm_bo_reserve_nolru(bo, true, true, true, val_seq);
+                ret = ttm_bo_reserve_nolru(bo, true, true, true, ticket);
                 switch (ret) {
                 case 0:
                         break;
@@ -148,8 +152,9 @@ retry:
                         ttm_eu_del_from_lru_locked(list);
                         spin_unlock(&glob->lru_lock);
                         ret = ttm_bo_reserve_nolru(bo, true, false,
-                                                   true, val_seq);
+                                                   true, ticket);
                         spin_lock(&glob->lru_lock);
+
                         if (!ret)
                                 break;
 
@@ -158,21 +163,13 @@ retry:
 
                         /* fallthrough */
                 case -EAGAIN:
-                        ttm_eu_backoff_reservation_locked(list);
-
-                        /*
-                         * temporarily increase sequence number every retry,
-                         * to prevent us from seeing our old reservation
-                         * sequence when someone else reserved the buffer,
-                         * but hasn't updated the seq_valid/seqno members yet.
-                         */
-                        val_seq = entry->bo->bdev->val_seq++;
-
+                        ttm_eu_backoff_reservation_locked(list, ticket);
                         spin_unlock(&glob->lru_lock);
                         ttm_eu_list_ref_sub(list);
-                        ret = ttm_bo_reserve_slowpath_nolru(bo, true, val_seq);
+                        ret = ttm_bo_reserve_slowpath_nolru(bo, true, ticket);
                         if (unlikely(ret != 0))
-                                return ret;
+                                goto err_fini;
+
                         spin_lock(&glob->lru_lock);
                         entry->reserved = true;
                         if (unlikely(atomic_read(&bo->cpu_writers) > 0)) {
@@ -191,21 +188,25 @@ retry:
                 }
         }
 
+        ww_acquire_done(ticket);
         ttm_eu_del_from_lru_locked(list);
         spin_unlock(&glob->lru_lock);
         ttm_eu_list_ref_sub(list);
-
         return 0;
 
 err:
-        ttm_eu_backoff_reservation_locked(list);
+        ttm_eu_backoff_reservation_locked(list, ticket);
         spin_unlock(&glob->lru_lock);
         ttm_eu_list_ref_sub(list);
+err_fini:
+        ww_acquire_done(ticket);
+        ww_acquire_fini(ticket);
         return ret;
 }
 EXPORT_SYMBOL(ttm_eu_reserve_buffers);
 
-void ttm_eu_fence_buffer_objects(struct list_head *list, void *sync_obj)
+void ttm_eu_fence_buffer_objects(struct ww_acquire_ctx *ticket,
+                                 struct list_head *list, void *sync_obj)
 {
         struct ttm_validate_buffer *entry;
         struct ttm_buffer_object *bo;
@@ -228,11 +229,12 @@ void ttm_eu_fence_buffer_objects(struct list_head *list, void *sync_obj)
                 bo = entry->bo;
                 entry->old_sync_obj = bo->sync_obj;
                 bo->sync_obj = driver->sync_obj_ref(sync_obj);
-                ttm_bo_unreserve_locked(bo);
+                ttm_bo_unreserve_ticket_locked(bo, ticket);
                 entry->reserved = false;
         }
         spin_unlock(&bdev->fence_lock);
         spin_unlock(&glob->lru_lock);
+        ww_acquire_fini(ticket);
 
         list_for_each_entry(entry, list, head) {
                 if (entry->old_sync_obj)