dma-buf: add more reservation object locking wrappers

[linux-2.6-block.git] / drivers / gpu / drm / drm_gem.c

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 243f43d70f42c7ab00e0d161172df18b7b8749b1..afc38cece3f539e80a514f899775c373b8564ca6 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -1288,8 +1288,8 @@ retry:
        if (contended != -1) {
                struct drm_gem_object *obj = objs[contended];
 
-               ret = ww_mutex_lock_slow_interruptible(&obj->resv->lock,
-                                                      acquire_ctx);
+               ret = reservation_object_lock_slow_interruptible(obj->resv,
+                                                                acquire_ctx);
                if (ret) {
                        ww_acquire_done(acquire_ctx);
                        return ret;
@@ -1300,16 +1300,16 @@ retry:
                if (i == contended)
                        continue;
 
-               ret = ww_mutex_lock_interruptible(&objs[i]->resv->lock,
-                                                 acquire_ctx);
+               ret = reservation_object_lock_interruptible(objs[i]->resv,
+                                                           acquire_ctx);
                if (ret) {
                        int j;
 
                        for (j = 0; j < i; j++)
-                               ww_mutex_unlock(&objs[j]->resv->lock);
+                               reservation_object_unlock(objs[j]->resv);
 
                        if (contended != -1 && contended >= i)
-                               ww_mutex_unlock(&objs[contended]->resv->lock);
+                               reservation_object_unlock(objs[contended]->resv);
 
                        if (ret == -EDEADLK) {
                                contended = i;
@@ -1334,7 +1334,7 @@ drm_gem_unlock_reservations(struct drm_gem_object **objs, int count,
        int i;
 
        for (i = 0; i < count; i++)
-               ww_mutex_unlock(&objs[i]->resv->lock);
+               reservation_object_unlock(objs[i]->resv);
 
        ww_acquire_fini(acquire_ctx);
 }