[PATCH 17/26] drm/i915: use new iterator in i915_gem_object_wait_priority v2

[Christian König]

Simplifying the code a bit.

v2: add missing rcu_read_lock()/unlock()

Signed-off-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_wait.c | 33 +++++++-----------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c 
b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
index a75dee9d7790..db8a72556338 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
@@ -124,32 +124,17 @@ i915_gem_object_wait_priority(struct drm_i915_gem_object 
*obj,
                              unsigned int flags,
                              const struct i915_sched_attr *attr)
 {
-       struct dma_fence *excl;
-
-       if (flags & I915_WAIT_ALL) {
-               struct dma_fence **shared;
-               unsigned int count, i;
-               int ret;
-
-               ret = dma_resv_get_fences(obj->base.resv, &excl, &count,
-                                         &shared);
-               if (ret)
-                       return ret;
-
-               for (i = 0; i < count; i++) {
-                       i915_gem_fence_wait_priority(shared[i], attr);
-                       dma_fence_put(shared[i]);
-               }
-
-               kfree(shared);
-       } else {
-               excl = dma_resv_get_excl_unlocked(obj->base.resv);
-       }
+       struct dma_resv_iter cursor;
+       struct dma_fence *fence;
 
-       if (excl) {
-               i915_gem_fence_wait_priority(excl, attr);
-               dma_fence_put(excl);
+       rcu_read_lock();
+       dma_resv_for_each_fence_unlocked(obj->base.resv, &cursor,
+                                        flags & I915_WAIT_ALL, fence) {
+               rcu_read_unlock();
+               i915_gem_fence_wait_priority(fence, attr);
+               rcu_read_lock();
        }
+       rcu_read_unlock();
        return 0;
 }
 
-- 
2.25.1