Merge tag 'drm-msm-next-2021-06-23b' of https://gitlab.freedesktop.org/drm/msm into...

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / msm_gem.c

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index f3b0fe7..1411787 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -812,9 +812,9 @@ int msm_gem_sync_object(struct drm_gem_object *obj,
        struct dma_fence *fence;
        int i, ret;
 
-       fobj = dma_resv_get_list(obj->resv);
+       fobj = dma_resv_shared_list(obj->resv);
        if (!fobj || (fobj->shared_count == 0)) {
-               fence = dma_resv_get_excl(obj->resv);
+               fence = dma_resv_excl_fence(obj->resv);
                /* don't need to wait on our own fences, since ring is fifo */
                if (fence && (fence->context != fctx->context)) {
                        ret = dma_fence_wait(fence, true);
@@ -910,8 +910,7 @@ int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout)
                op & MSM_PREP_NOSYNC ? 0 : timeout_to_jiffies(timeout);
        long ret;
 
-       ret = dma_resv_wait_timeout_rcu(obj->resv, write,
-                                                 true,  remain);
+       ret = dma_resv_wait_timeout(obj->resv, write, true,  remain);
        if (ret == 0)
                return remain == 0 ? -EBUSY : -ETIMEDOUT;
        else if (ret < 0)
@@ -1020,7 +1019,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m,
        }
 
        rcu_read_lock();
-       fobj = rcu_dereference(robj->fence);
+       fobj = dma_resv_shared_list(robj);
        if (fobj) {
                unsigned int i, shared_count = fobj->shared_count;
 
@@ -1030,7 +1029,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m,
                }
        }
 
-       fence = rcu_dereference(robj->fence_excl);
+       fence = dma_resv_excl_fence(robj);
        if (fence)
                describe_fence(fence, "Exclusive", m);
        rcu_read_unlock();