| Message ID | 20220509072404.1423018-3-jouni.hogander@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixes for selective fetch area calculation | expand |
On Mon, 2022-05-09 at 10:24 +0300, Jouni Högander wrote: > Current update area calculation is not handling situation where > e.g. cursor plane is fully or partially outside pipe area. > > Fix this by checking damage area against pipe_src area using > drm_rect_intersect. > > v2: Set x1 and x2 in damaged_area initialization > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5440 > Cc: José Roberto de Souza <jose.souza@intel.com> > Cc: Mika Kahola <mika.kahola@intel.com> > Tested-by: Mark Pearson <markpearson@lenovo.com> > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> > --- > drivers/gpu/drm/i915/display/intel_psr.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index 8c099d24de86..ecd062a0fea4 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -1708,7 +1708,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, > */ > for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state, > new_plane_state, i) { > - struct drm_rect src, damaged_area = { .y1 = -1 }; > + /* Set damaged_area x1 and x2 for drm_rect_intersect usage */ > + struct drm_rect src, damaged_area = { .x1 = 0, .y1 = -1, > + .x2 = INT_MAX }; In my opinion this comment is not necessary. > struct drm_atomic_helper_damage_iter iter; > struct drm_rect clip; > > @@ -1735,20 +1737,23 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, > if (old_plane_state->uapi.visible) { > damaged_area.y1 = old_plane_state->uapi.dst.y1; > damaged_area.y2 = old_plane_state->uapi.dst.y2; > - clip_area_update(&pipe_clip, &damaged_area); > + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) > + clip_area_update(&pipe_clip, &damaged_area); What about the suggestion to move the drm_rect_intersect() to clip_area_update()? > } > > if (new_plane_state->uapi.visible) { > damaged_area.y1 = new_plane_state->uapi.dst.y1; > damaged_area.y2 = new_plane_state->uapi.dst.y2; > - clip_area_update(&pipe_clip, &damaged_area); > + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) > + clip_area_update(&pipe_clip, &damaged_area); > } > continue; > } else if (new_plane_state->uapi.alpha != old_plane_state->uapi.alpha) { > /* If alpha changed mark the whole plane area as damaged */ > damaged_area.y1 = new_plane_state->uapi.dst.y1; > damaged_area.y2 = new_plane_state->uapi.dst.y2; > - clip_area_update(&pipe_clip, &damaged_area); > + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) > + clip_area_update(&pipe_clip, &damaged_area); > continue; > } > > @@ -1767,7 +1772,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, > > damaged_area.y1 += new_plane_state->uapi.dst.y1 - src.y1; > damaged_area.y2 += new_plane_state->uapi.dst.y1 - src.y1; > - clip_area_update(&pipe_clip, &damaged_area); > + > + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) > + clip_area_update(&pipe_clip, &damaged_area); > } > > if (pipe_clip.y1 == -1)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 8c099d24de86..ecd062a0fea4 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1708,7 +1708,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, */ for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { - struct drm_rect src, damaged_area = { .y1 = -1 }; + /* Set damaged_area x1 and x2 for drm_rect_intersect usage */ + struct drm_rect src, damaged_area = { .x1 = 0, .y1 = -1, + .x2 = INT_MAX }; struct drm_atomic_helper_damage_iter iter; struct drm_rect clip; @@ -1735,20 +1737,23 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, if (old_plane_state->uapi.visible) { damaged_area.y1 = old_plane_state->uapi.dst.y1; damaged_area.y2 = old_plane_state->uapi.dst.y2; - clip_area_update(&pipe_clip, &damaged_area); + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) + clip_area_update(&pipe_clip, &damaged_area); } if (new_plane_state->uapi.visible) { damaged_area.y1 = new_plane_state->uapi.dst.y1; damaged_area.y2 = new_plane_state->uapi.dst.y2; - clip_area_update(&pipe_clip, &damaged_area); + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) + clip_area_update(&pipe_clip, &damaged_area); } continue; } else if (new_plane_state->uapi.alpha != old_plane_state->uapi.alpha) { /* If alpha changed mark the whole plane area as damaged */ damaged_area.y1 = new_plane_state->uapi.dst.y1; damaged_area.y2 = new_plane_state->uapi.dst.y2; - clip_area_update(&pipe_clip, &damaged_area); + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) + clip_area_update(&pipe_clip, &damaged_area); continue; } @@ -1767,7 +1772,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, damaged_area.y1 += new_plane_state->uapi.dst.y1 - src.y1; damaged_area.y2 += new_plane_state->uapi.dst.y1 - src.y1; - clip_area_update(&pipe_clip, &damaged_area); + + if (drm_rect_intersect(&damaged_area, &crtc_state->pipe_src)) + clip_area_update(&pipe_clip, &damaged_area); } if (pipe_clip.y1 == -1)