diff options
| author |   Christian König <christian.koenig@amd.com> | 2021-09-13 13:16:40 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2021-11-17 14:23:39 +0100 |
| commit | 73495209f645183c84a86bc067818a8c4ac20fdd (patch) | |
| tree | c8fb249f4a52f998de090d8a1df8da3d32589489 /drivers | |
| parent | drm/i915: use the new iterator in i915_gem_busy_ioctl v2 (diff) | |
| download | linux-dev-73495209f645183c84a86bc067818a8c4ac20fdd.tar.xz linux-dev-73495209f645183c84a86bc067818a8c4ac20fdd.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_wait.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c index f909aaa09d9c..34e46134326b 100644 --- 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; } |