[PATCH 15/26] drm/i915: use the new iterator in i915_request_await_object v2

[Christian König]

Simplifying the code a bit.

v2: add missing rcu_read_lock()/rcu_read_unlock()

Signed-off-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/i915/i915_request.c | 40 ++++++++---------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_request.c 
b/drivers/gpu/drm/i915/i915_request.c
index ce446716d092..221df2edcf02 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -1509,39 +1509,21 @@ i915_request_await_object(struct i915_request *to,
                          struct drm_i915_gem_object *obj,
                          bool write)
 {
-       struct dma_fence *excl;
+       struct dma_resv_iter cursor;
+       struct dma_fence *fence;
        int ret = 0;
 
-       if (write) {
-               struct dma_fence **shared;
-               unsigned int count, i;
-
-               ret = dma_resv_get_fences(obj->base.resv, &excl, &count,
-                                         &shared);
-               if (ret)
-                       return ret;
-
-               for (i = 0; i < count; i++) {
-                       ret = i915_request_await_dma_fence(to, shared[i]);
-                       if (ret)
-                               break;
-
-                       dma_fence_put(shared[i]);
+       rcu_read_lock();
+       dma_resv_for_each_fence_unlocked(obj->base.resv, &cursor, write, fence) 
{
+               rcu_read_unlock();
+               ret = i915_request_await_dma_fence(to, fence);
+               rcu_read_lock();
+               if (ret) {
+                       dma_fence_put(fence);
+                       break;
                }
-
-               for (; i < count; i++)
-                       dma_fence_put(shared[i]);
-               kfree(shared);
-       } else {
-               excl = dma_resv_get_excl_unlocked(obj->base.resv);
-       }
-
-       if (excl) {
-               if (ret == 0)
-                       ret = i915_request_await_dma_fence(to, excl);
-
-               dma_fence_put(excl);
        }
+       rcu_read_unlock();
 
        return ret;
 }
-- 
2.25.1