| Message ID | 20220823112920.352563-4-jouni.hogander@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixes for damage clips handling | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jouni > Högander > Sent: Tuesday, August 23, 2022 2:29 PM > To: dri-devel@lists.freedesktop.org; intel-gfx@lists.freedesktop.org > Subject: [Intel-gfx] [PATCH v2 3/4] drm/i915/display: Use drm helper instead of > own loop for damage clips > > Use existing drm_atomic_helper_damage_merged from generic drm code > instead of implementing own loop to iterate over damage_clips. > Reviewed-by: Mika Kahola <mika.kahola@intel.com> > Signed-off-by: Jouni Högander <jouni.hogander@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 16985de24019..0ce8076be000 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.34.1
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 16985de24019..0ce8076be000 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); }
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.hogander@intel.com> --- drivers/gpu/drm/i915/display/intel_psr.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)