dma-buf: rename reservation_object to dma_resv

[linux.git] / drivers / gpu / drm / i915 / i915_gem_batch_pool.c

diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
index 25a3e4d09a2ffe9c6589999fd9e10ca6b4981db9..5f82a763e64ca9b6d1d3bed9d3aa36165c89a625 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c
+++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
@@ -96,9 +96,9 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool,
        list_for_each_entry(obj, list, batch_pool_link) {
                /* The batches are strictly LRU ordered */
                if (i915_gem_object_is_active(obj)) {
-                       struct reservation_object *resv = obj->base.resv;
+                       struct dma_resv *resv = obj->base.resv;
 
-                       if (!reservation_object_test_signaled_rcu(resv, true))
+                       if (!dma_resv_test_signaled_rcu(resv, true))
                                break;
 
                        i915_retire_requests(pool->engine->i915);
@@ -113,13 +113,13 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool,
                         * than replace the existing fence.
                         */
                        if (rcu_access_pointer(resv->fence)) {
-                               reservation_object_lock(resv, NULL);
-                               reservation_object_add_excl_fence(resv, NULL);
-                               reservation_object_unlock(resv);
+                               dma_resv_lock(resv, NULL);
+                               dma_resv_add_excl_fence(resv, NULL);
+                               dma_resv_unlock(resv);
                        }
                }
 
-               GEM_BUG_ON(!reservation_object_test_signaled_rcu(obj->base.resv,
+               GEM_BUG_ON(!dma_resv_test_signaled_rcu(obj->base.resv,
                                                                 true));
 
                if (obj->base.size >= size)