dma-buf: rename reservation_object to dma_resv

[linux.git] / drivers / gpu / drm / drm_gem.c

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index a2dd198177f2df544c6833004d0aae241ad1130c..6854f5867d51bccea46465d92dfd7b32849ca851 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -159,7 +159,7 @@ void drm_gem_private_object_init(struct drm_device *dev,
        kref_init(&obj->refcount);
        obj->handle_count = 0;
        obj->size = size;
-       reservation_object_init(&obj->_resv);
+       dma_resv_init(&obj->_resv);
        if (!obj->resv)
                obj->resv = &obj->_resv;
 
@@ -755,7 +755,7 @@ drm_gem_object_lookup(struct drm_file *filp, u32 handle)
 EXPORT_SYMBOL(drm_gem_object_lookup);
 
 /**
- * drm_gem_reservation_object_wait - Wait on GEM object's reservation's objects
+ * drm_gem_dma_resv_wait - Wait on GEM object's reservation's objects
  * shared and/or exclusive fences.
  * @filep: DRM file private date
  * @handle: userspace handle
@@ -767,7 +767,7 @@ EXPORT_SYMBOL(drm_gem_object_lookup);
  * Returns -ERESTARTSYS if interrupted, 0 if the wait timed out, or
  * greater than 0 on success.
  */
-long drm_gem_reservation_object_wait(struct drm_file *filep, u32 handle,
+long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
                                    bool wait_all, unsigned long timeout)
 {
        long ret;
@@ -779,7 +779,7 @@ long drm_gem_reservation_object_wait(struct drm_file *filep, u32 handle,
                return -EINVAL;
        }
 
-       ret = reservation_object_wait_timeout_rcu(obj->resv, wait_all,
+       ret = dma_resv_wait_timeout_rcu(obj->resv, wait_all,
                                                  true, timeout);
        if (ret == 0)
                ret = -ETIME;
@@ -790,7 +790,7 @@ long drm_gem_reservation_object_wait(struct drm_file *filep, u32 handle,
 
        return ret;
 }
-EXPORT_SYMBOL(drm_gem_reservation_object_wait);
+EXPORT_SYMBOL(drm_gem_dma_resv_wait);
 
 /**
  * drm_gem_close_ioctl - implementation of the GEM_CLOSE ioctl
@@ -956,7 +956,7 @@ drm_gem_object_release(struct drm_gem_object *obj)
        if (obj->filp)
                fput(obj->filp);
 
-       reservation_object_fini(&obj->_resv);
+       dma_resv_fini(&obj->_resv);
        drm_gem_free_mmap_offset(obj);
 }
 EXPORT_SYMBOL(drm_gem_object_release);
@@ -1291,7 +1291,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
        if (contended != -1) {
                struct drm_gem_object *obj = objs[contended];
 
-               ret = reservation_object_lock_slow_interruptible(obj->resv,
+               ret = dma_resv_lock_slow_interruptible(obj->resv,
                                                                 acquire_ctx);
                if (ret) {
                        ww_acquire_done(acquire_ctx);
@@ -1303,16 +1303,16 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
                if (i == contended)
                        continue;
 
-               ret = reservation_object_lock_interruptible(objs[i]->resv,
+               ret = dma_resv_lock_interruptible(objs[i]->resv,
                                                            acquire_ctx);
                if (ret) {
                        int j;
 
                        for (j = 0; j < i; j++)
-                               reservation_object_unlock(objs[j]->resv);
+                               dma_resv_unlock(objs[j]->resv);
 
                        if (contended != -1 && contended >= i)
-                               reservation_object_unlock(objs[contended]->resv);
+                               dma_resv_unlock(objs[contended]->resv);
 
                        if (ret == -EDEADLK) {
                                contended = i;
@@ -1337,7 +1337,7 @@ drm_gem_unlock_reservations(struct drm_gem_object **objs, int count,
        int i;
 
        for (i = 0; i < count; i++)
-               reservation_object_unlock(objs[i]->resv);
+               dma_resv_unlock(objs[i]->resv);
 
        ww_acquire_fini(acquire_ctx);
 }
@@ -1413,12 +1413,12 @@ int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
 
        if (!write) {
                struct dma_fence *fence =
-                       reservation_object_get_excl_rcu(obj->resv);
+                       dma_resv_get_excl_rcu(obj->resv);
 
                return drm_gem_fence_array_add(fence_array, fence);
        }
 
-       ret = reservation_object_get_fences_rcu(obj->resv, NULL,
+       ret = dma_resv_get_fences_rcu(obj->resv, NULL,
                                                &fence_count, &fences);
        if (ret || !fence_count)
                return ret;