drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2

Simplifying the code a bit.

v2: use dma_resv_for_each_fence

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

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 042c16b..5bc5f77 100644 (file)
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -699,30 +699,16 @@ int drm_sched_job_add_implicit_dependencies(struct drm_sched_job *job,
                                            struct drm_gem_object *obj,
                                            bool write)
 {
+       struct dma_resv_iter cursor;
+       struct dma_fence *fence;
        int ret;
-       struct dma_fence **fences;
-       unsigned int i, fence_count;
-
-       if (!write) {
-               struct dma_fence *fence = dma_resv_get_excl_unlocked(obj->resv);
-
-               return drm_sched_job_add_dependency(job, fence);
-       }
-
-       ret = dma_resv_get_fences(obj->resv, NULL, &fence_count, &fences);
-       if (ret || !fence_count)
-               return ret;
 
-       for (i = 0; i < fence_count; i++) {
-               ret = drm_sched_job_add_dependency(job, fences[i]);
+       dma_resv_for_each_fence(&cursor, obj->resv, write, fence) {
+               ret = drm_sched_job_add_dependency(job, fence);
                if (ret)
-                       break;
+                       return ret;
        }
-
-       for (; i < fence_count; i++)
-               dma_fence_put(fences[i]);
-       kfree(fences);
-       return ret;
+       return 0;
 }
 EXPORT_SYMBOL(drm_sched_job_add_implicit_dependencies);