[Intel-gfx] [PATCH 3/3] drm/i915/display: Use drm helper instead of own loop for damage clips

[Jouni Högander]

Use existing drm_atomic_helper_damage_merged from generic drm code
instead of implementing own loop to iterate over damage_clips.

Signed-off-by: Jouni Högander <jouni.hogan...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c 
b/drivers/gpu/drm/i915/display/intel_psr.c
index 5c95e24dc8d6..d44662f19b53 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1721,8 +1721,6 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state 
*state,
                                             new_plane_state, i) {
                struct drm_rect src, damaged_area = { .x1 = 0, .y1 = -1,
                                                      .x2 = INT_MAX };
-               struct drm_atomic_helper_damage_iter iter;
-               struct drm_rect clip;
 
                if (new_plane_state->uapi.crtc != crtc_state->uapi.crtc)
                        continue;
@@ -1770,20 +1768,15 @@ int intel_psr2_sel_fetch_update(struct 
intel_atomic_state *state,
                src = drm_plane_state_src(&new_plane_state->uapi);
                drm_rect_fp_to_int(&src, &src);
 
-               drm_atomic_helper_damage_iter_init(&iter,
-                                                  &old_plane_state->uapi,
-                                                  &new_plane_state->uapi);
-               drm_atomic_for_each_plane_damage(&iter, &clip) {
-                       if (drm_rect_intersect(&clip, &src))
-                               clip_area_update(&damaged_area, &clip,
-                                                &crtc_state->pipe_src);
-               }
-
-               if (damaged_area.y1 == -1)
+               if (!drm_atomic_helper_damage_merged(&old_plane_state->uapi,
+                                                    &new_plane_state->uapi, 
&damaged_area))
                        continue;
 
                damaged_area.y1 += new_plane_state->uapi.dst.y1 - src.y1;
                damaged_area.y2 += new_plane_state->uapi.dst.y1 - src.y1;
+               damaged_area.x1 += new_plane_state->uapi.dst.x1 - src.x1;
+               damaged_area.x2 += new_plane_state->uapi.dst.x1 - src.x1;
+
                clip_area_update(&pipe_clip, &damaged_area, 
&crtc_state->pipe_src);
        }
 
-- 
2.25.1