Skip to content

Commit 5e9ddbd

Browse files
drm/i915: use new cursor in intel_prepare_plane_fb v2
Simplifying the code a bit. v2: rebased Signed-off-by: Christian König <[email protected]> Acked-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 1b5bdf0 commit 5e9ddbd

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/gpu/drm/i915/display/intel_atomic_plane.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
738738
i915_gem_object_wait_priority(obj, 0, &attr);
739739

740740
if (!new_plane_state->uapi.fence) { /* implicit fencing */
741+
struct dma_resv_iter cursor;
741742
struct dma_fence *fence;
742743

743744
ret = i915_sw_fence_await_reservation(&state->commit_ready,
@@ -748,12 +749,12 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
748749
if (ret < 0)
749750
goto unpin_fb;
750751

751-
fence = dma_resv_get_excl_unlocked(obj->base.resv);
752-
if (fence) {
752+
dma_resv_iter_begin(&cursor, obj->base.resv, false);
753+
dma_resv_for_each_fence_unlocked(&cursor, fence) {
753754
add_rps_boost_after_vblank(new_plane_state->hw.crtc,
754755
fence);
755-
dma_fence_put(fence);
756756
}
757+
dma_resv_iter_end(&cursor);
757758
} else {
758759
add_rps_boost_after_vblank(new_plane_state->hw.crtc,
759760
new_plane_state->uapi.fence);

0 commit comments

Comments
 (0)