[PATCH 19/26] drm/i915: use new cursor in intel_prepare_plane_fb v2

[Christian König]

Simplifying the code a bit.

v2: add rcu_read_lock()/unlock()

Signed-off-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 134a6acbd8fb..51e3df0de1ce 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11290,6 +11290,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
        i915_gem_object_flush_frontbuffer(obj, ORIGIN_DIRTYFB);
 
        if (!new_plane_state->uapi.fence) { /* implicit fencing */
+               struct dma_resv_iter cursor;
                struct dma_fence *fence;
 
                ret = i915_sw_fence_await_reservation(&state->commit_ready,
@@ -11300,12 +11301,16 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
                if (ret < 0)
                        goto unpin_fb;
 
-               fence = dma_resv_get_excl_unlocked(obj->base.resv);
-               if (fence) {
+               rcu_read_lock();
+               dma_resv_iter_begin(&cursor, obj->base.resv, false);
+               dma_resv_for_each_fence_unlocked(&cursor, fence) {
+                       rcu_read_unlock();
                        add_rps_boost_after_vblank(new_plane_state->hw.crtc,
                                                   fence);
-                       dma_fence_put(fence);
+                       rcu_read_lock();
                }
+               dma_resv_iter_end(&cursor);
+               rcu_read_unlock();
        } else {
                add_rps_boost_after_vblank(new_plane_state->hw.crtc,
                                           new_plane_state->uapi.fence);
-- 
2.25.1