Skip to content

Commit 9c2ba26

Browse files
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
1 parent dbcae3b commit 9c2ba26

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

drivers/gpu/drm/scheduler/sched_main.c

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -699,30 +699,16 @@ int drm_sched_job_add_implicit_dependencies(struct drm_sched_job *job,
699699
struct drm_gem_object *obj,
700700
bool write)
701701
{
702+
struct dma_resv_iter cursor;
703+
struct dma_fence *fence;
702704
int ret;
703-
struct dma_fence **fences;
704-
unsigned int i, fence_count;
705-
706-
if (!write) {
707-
struct dma_fence *fence = dma_resv_get_excl_unlocked(obj->resv);
708-
709-
return drm_sched_job_add_dependency(job, fence);
710-
}
711-
712-
ret = dma_resv_get_fences(obj->resv, NULL, &fence_count, &fences);
713-
if (ret || !fence_count)
714-
return ret;
715705

716-
for (i = 0; i < fence_count; i++) {
717-
ret = drm_sched_job_add_dependency(job, fences[i]);
706+
dma_resv_for_each_fence(&cursor, obj->resv, write, fence) {
707+
ret = drm_sched_job_add_dependency(job, fence);
718708
if (ret)
719-
break;
709+
return ret;
720710
}
721-
722-
for (; i < fence_count; i++)
723-
dma_fence_put(fences[i]);
724-
kfree(fences);
725-
return ret;
711+
return 0;
726712
}
727713
EXPORT_SYMBOL(drm_sched_job_add_implicit_dependencies);
728714

0 commit comments

Comments
 (0)