Merge tag 'ttm-next-2014-04-04' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 2014-04-04

Currently only a single patch fixing up mixed use of the ttm_bo_reserve and
ww_mutex APIs

* tag 'ttm-next-2014-04-04' of git://people.freedesktop.org/~thomash/linux:
  drm/ttm: Hide the implementation details of reservation

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c
index 479e9418e3d7..e8dac8758528 100644
--- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c
+++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c
@@ -46,7 +46,7 @@ static void ttm_eu_backoff_reservation_locked(struct list_head *list)
                         ttm_bo_add_to_lru(bo);
                         entry->removed = false;
                 }
-                ww_mutex_unlock(&bo->resv->lock);
+                __ttm_bo_unreserve(bo);
         }
 }
 
@@ -140,8 +140,8 @@ retry:
                 if (entry->reserved)
                         continue;
 
-                ret = ttm_bo_reserve_nolru(bo, true, (ticket == NULL), true,
-                                           ticket);
+                ret = __ttm_bo_reserve(bo, true, (ticket == NULL), true,
+                                       ticket);
 
                 if (ret == -EDEADLK) {
                         /* uh oh, we lost out, drop every reservation and try
@@ -224,7 +224,7 @@ void ttm_eu_fence_buffer_objects(struct ww_acquire_ctx *ticket,
                 entry->old_sync_obj = bo->sync_obj;
                 bo->sync_obj = driver->sync_obj_ref(sync_obj);
                 ttm_bo_add_to_lru(bo);
-                ww_mutex_unlock(&bo->resv->lock);
+                __ttm_bo_unreserve(bo);
                 entry->reserved = false;
         }
         spin_unlock(&bdev->fence_lock);