From 4ff4ebac3f1378f4ba6e11fe5ad4a4ac590bb8a4 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jouni=20H=C3=B6gander?= <jouni.hogander@intel.com>

Date: Mon, 24 Oct 2022 08:46:49 +0300

Subject: drm/i915/psr: Send update also on invalidate

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Alt-commit: d755f89220a2b49bc90b7b520bb6edeb4adb5f01

Git-commit: 4ff4ebac3f1378f4ba6e11fe5ad4a4ac590bb8a4

Patch-mainline: v6.1-rc5

References: git-fixes

Currently we are observing mouse cursor stuttering when using

xrandr --scaling=1.2x1.2. X scaling/transformation seems to be

doing fronbuffer rendering. When moving mouse cursor X seems to

perform several invalidates and only one DirtyFB. I.e. it seems

to be assuming updates are sent to panel while drawing is done.

Earlier we were disabling PSR in frontbuffer invalidate call back

(when drawing in X started). PSR was re-enabled in frontbuffer

flush callback (dirtyfb ioctl). This was working fine with X

scaling/transformation. Now we are just enabling continuous full

frame (cff) in PSR invalidate callback. Enabling cff doesn't

trigger any updates. It just configures PSR to send full frame

when updates are sent. I.e. there are no updates on screen before

PSR flush callback is made. X seems to be doing several updates

in frontbuffer before doing dirtyfb ioctl.

Fix this by sending single update on every invalidate callback.

Cc: José Roberto de Souza <jose.souza@intel.com>

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>

Cc: Mika Kahola <mika.kahola@intel.com>

Fixes: 805f04d42a6b ("drm/i915/display/psr: Use continuos full frame to handle frontbuffer invalidations")

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6679

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>

Reported-by: Brian J. Tarricone <brian@tarricone.org>

Tested-by: Brian J. Tarricone <brian@tarricone.org>

Reviewed-by: Mika Kahola <mika.kahola@intel.com>

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20221024054649.31299-1-jouni.hogander@intel.com

(cherry picked from commit d755f89220a2b49bc90b7b520bb6edeb4adb5f01)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Acked-by: Patrik Jakobsson <pjakobsson@suse.de>

---

 drivers/gpu/drm/i915/display/intel_psr.c | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c

index d4cce627d7a8..15c3e448aa0e 100644

--- a/drivers/gpu/drm/i915/display/intel_psr.c

+++ b/drivers/gpu/drm/i915/display/intel_psr.c

@@ -2201,8 +2201,11 @@ static void _psr_invalidate_handle(struct intel_dp *intel_dp)

 	if (intel_dp->psr.psr2_sel_fetch_enabled) {

 		u32 val;

-		if (intel_dp->psr.psr2_sel_fetch_cff_enabled)

+		if (intel_dp->psr.psr2_sel_fetch_cff_enabled) {

+			/* Send one update otherwise lag is observed in screen */

+			intel_de_write(dev_priv, CURSURFLIVE(intel_dp->psr.pipe), 0);

 			return;

+		}

 		val = man_trk_ctl_enable_bit_get(dev_priv) |

 		      man_trk_ctl_partial_frame_bit_get(dev_priv) |

-- 

2.39.0