drm/i915: use new iterator in i915_gem_object_wait_priority

Simplifying the code a bit.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211116102431.198905-3-christian.koenig@amd.com

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
index f909aaa09d9c3cd3f8268073e09bc0b091729176..34e46134326b268af1f35d5cb05000efa9c1f80f 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
@@ -151,32 +151,13 @@ 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;
+       struct dma_resv_iter cursor;
+       struct dma_fence *fence;
 
-               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);
-       }
-
-       if (excl) {
-               i915_gem_fence_wait_priority(excl, attr);
-               dma_fence_put(excl);
-       }
+       dma_resv_iter_begin(&cursor, obj->base.resv, flags & I915_WAIT_ALL);
+       dma_resv_for_each_fence_unlocked(&cursor, fence)
+               i915_gem_fence_wait_priority(fence, attr);
+       dma_resv_iter_end(&cursor);
        return 0;
 }