Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 381f8a20 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/psr: Force manual PSR exit in older gens 

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: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Tested-by: default avatarThomas Rohwer <trohwer85@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190617195154.30292-1-jose.souza@intel.com
parent eca15360

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

+26 −10
Original line number Diff line number Diff line
@@ -863,8 +863,9 @@ void intel_psr_disable(struct intel_dp *intel_dp, 


static void psr_force_hw_tracking_exit(struct drm_i915_private *dev_priv)

{

	if (INTEL_GEN(dev_priv) >= 9)

		/*

	 * Display WA #0884: all

		 * 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.
@@ -873,6 +874,12 @@ static void psr_force_hw_tracking_exit(struct drm_i915_private *dev_priv) 
		 * pipe.

		 */

		I915_WRITE(CURSURFLIVE(dev_priv->psr.pipe), 0);

	else

		/*

		 * A write to CURSURFLIVE do not cause HW tracking to exit PSR

		 * on older gens so doing the manual exit instead.

		 */

		intel_psr_exit(dev_priv);

}



/**
@@ -903,6 +910,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 && psr->enabled) {

			/*

			 * 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;

	}