drm/msm: Use dma_resv locking wrappers

I'll add more fancy logic to them soon, so everyone really has to use
them. Plus they already provide some nice additional debug
infrastructure on top of direct ww_mutex usage for the fences tracked
by dma_resv.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20191125094356.161941-4-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 7d04c47..385d496 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -157,7 +157,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit *submit,
                msm_gem_unpin_iova(&msm_obj->base, submit->aspace);
 
        if (submit->bos[i].flags & BO_LOCKED)
-               ww_mutex_unlock(&msm_obj->base.resv->lock);
+               dma_resv_unlock(msm_obj->base.resv);
 
        if (backoff && !(submit->bos[i].flags & BO_VALID))
                submit->bos[i].iova = 0;
@@ -180,8 +180,8 @@ retry:
                contended = i;
 
                if (!(submit->bos[i].flags & BO_LOCKED)) {
-                       ret = ww_mutex_lock_interruptible(&msm_obj->base.resv->lock,
-                                       &submit->ticket);
+                       ret = dma_resv_lock_interruptible(msm_obj->base.resv,
+                                                         &submit->ticket);
                        if (ret)
                                goto fail;
                        submit->bos[i].flags |= BO_LOCKED;
@@ -202,8 +202,8 @@ fail:
        if (ret == -EDEADLK) {
                struct msm_gem_object *msm_obj = submit->bos[contended].obj;
                /* we lost out in a seqno race, lock and retry.. */
-               ret = ww_mutex_lock_slow_interruptible(&msm_obj->base.resv->lock,
-                               &submit->ticket);
+               ret = dma_resv_lock_slow_interruptible(msm_obj->base.resv,
+                                                      &submit->ticket);
                if (!ret) {
                        submit->bos[contended].flags |= BO_LOCKED;
                        slow_locked = contended;