drm/i915/display: Workaround cursor left overs with PSR2 selective fetch enabled

[ Upstream commit 1f3a11c341ab211d6ba55ef3d58026b7b5319945 ]

Not sure why but when moving the cursor fast it causes some artifacts
of the cursor to be left in the cursor path, adding some pixels above
the cursor to the damaged area fixes the issue, so leaving this as a
workaround until proper fix is found.

This is reproducile on TGL and ADL-P.

Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210914212507.177511-3-jose.souza@intel.com
Stable-dep-of: 71c602103c74 ("drm/i915/psr: Use calculated io and fast wake lines")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index a3d0c57ec0f0b4fdcd9b64e0ac22de8d4b4c4cdf..b4b193c2bc32e873c58d321b478c6de630ccdced 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1601,6 +1601,28 @@ static void intel_psr2_sel_fetch_pipe_alignment(const struct intel_crtc_state *c
                drm_warn(&dev_priv->drm, "Missing PSR2 sel fetch alignment with DSC\n");
 }
 
+/*
+ * FIXME: Not sure why but when moving the cursor fast it causes some artifacts
+ * of the cursor to be left in the cursor path, adding some pixels above the
+ * cursor to the damaged area fixes the issue.
+ */
+static void cursor_area_workaround(const struct intel_plane_state *new_plane_state,
+                                  struct drm_rect *damaged_area,
+                                  struct drm_rect *pipe_clip)
+{
+       const struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane);
+       int height;
+
+       if (plane->id != PLANE_CURSOR)
+               return;
+
+       height = drm_rect_height(&new_plane_state->uapi.dst) / 2;
+       damaged_area->y1 -=  height;
+       damaged_area->y1 = max(damaged_area->y1, 0);
+
+       clip_area_update(pipe_clip, damaged_area);
+}
+
 int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
                                struct intel_crtc *crtc)
 {
@@ -1669,6 +1691,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,
                                damaged_area.y2 = new_plane_state->uapi.dst.y2;
                                clip_area_update(&pipe_clip, &damaged_area);
                        }
+
+                       cursor_area_workaround(new_plane_state, &damaged_area,
+                                              &pipe_clip);
                        continue;
                } else if (new_plane_state->uapi.alpha != old_plane_state->uapi.alpha ||
                           (!num_clips &&