Attachment 144547 Details for Bug 110799 – proposed fix

[patch] proposed fix

0001-drm-i915-psr-Force-manual-PSR-exit-in-older-gens.patch (text/plain), 2.55 KB, created by Jose Roberto de Souza on 2019-06-14 17:15:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose Roberto de Souza

Created: 2019-06-14 17:15:59 UTC

Size: 2.55 KB

patch

obsolete

>From 03b07cdddf2cc6a5b08cbbab5eff15149f171c85 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <jose.souza@intel.com>
>Date: Fri, 14 Jun 2019 10:00:52 -0700
>Subject: [PATCH] drm/i915/psr: Force manual PSR exit in older gens
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>To do frontbuffer tracking we are depending on Display WA #0884 to
>exit PSR when there is a frontbuffer modification but according to
>user reports a write to CURSURFLIVE do not cause PSR to exit in older
>gens so lets force a PSR exit.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110799
>Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>Signed-off-by: JosÃ© Roberto de Souza <jose.souza@intel.com>
>---
> drivers/gpu/drm/i915/intel_psr.c | 32 ++++++++++++++++++++++----------
> 1 file changed, 22 insertions(+), 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
>index 01ca502099df..c013be7f2601 100644
>--- a/drivers/gpu/drm/i915/intel_psr.c
>+++ b/drivers/gpu/drm/i915/intel_psr.c
>@@ -862,16 +862,19 @@ void intel_psr_disable(struct intel_dp *intel_dp,
> 
> static void psr_force_hw_tracking_exit(struct drm_i915_private *dev_priv)
> {
>-	/*
>-	 * Display WA #0884: all
>-	 * This documented WA for bxt can be safely applied
>-	 * broadly so we can force HW tracking to exit PSR
>-	 * instead of disabling and re-enabling.
>-	 * Workaround tells us to write 0 to CUR_SURFLIVE_A,
>-	 * but it makes more sense write to the current active
>-	 * pipe.
>-	 */
>-	I915_WRITE(CURSURFLIVE(dev_priv->psr.pipe), 0);
>+	if (INTEL_GEN(dev_priv) >= 9)
>+		/*
>+		 * Display WA #0884: skl+
>+		 * This documented WA for bxt can be safely applied
>+		 * broadly so we can force HW tracking to exit PSR
>+		 * instead of disabling and re-enabling.
>+		 * Workaround tells us to write 0 to CUR_SURFLIVE_A,
>+		 * but it makes more sense write to the current active
>+		 * pipe.
>+		 */
>+		I915_WRITE(CURSURFLIVE(dev_priv->psr.pipe), 0);
>+	else
>+		intel_psr_exit(dev_priv);
> }
> 
> /**
>@@ -902,6 +905,15 @@ void intel_psr_update(struct intel_dp *intel_dp,
> 		/* Force a PSR exit when enabling CRC to avoid CRC timeouts */
> 		if (crtc_state->crc_enabled && psr->enabled)
> 			psr_force_hw_tracking_exit(dev_priv);
>+		else if (INTEL_GEN(dev_priv) < 9) {
>+			/*
>+			 * Activate PSR again after a force exit when enabling
>+			 * CRC in older gens
>+			 */
>+			if (!dev_priv->psr.active &&
>+			    !dev_priv->psr.busy_frontbuffer_bits)
>+				schedule_work(&dev_priv->psr.work);
>+		}
> 
> 		goto unlock;
> 	}
>-- 
>2.22.0
>

Actions: View | Splinter Review

Attachments on bug 110799: 144387 | 144388 | 144389 | 144547

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.