Commit 9c4a1126 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-01-26' of... 

Merge tag 'drm-intel-fixes-2024-01-26' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- PSR fix for HSW

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZbPGBL9lj4DxxIW1@jlahtine-mobl.ger.corp.intel.com
parents ddd2b472 f9f031dd

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

+12 −2
Original line number Diff line number Diff line
@@ -1525,8 +1525,18 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, 
	 * can rely on frontbuffer tracking.

	 */

	mask = EDP_PSR_DEBUG_MASK_MEMUP |

	       EDP_PSR_DEBUG_MASK_HPD |

	       EDP_PSR_DEBUG_MASK_LPSP;

	       EDP_PSR_DEBUG_MASK_HPD;



	/*

	 * For some unknown reason on HSW non-ULT (or at least on

	 * Dell Latitude E6540) external displays start to flicker

	 * when PSR is enabled on the eDP. SR/PC6 residency is much

	 * higher than should be possible with an external display.

	 * As a workaround leave LPSP unmasked to prevent PSR entry

	 * when external displays are active.

	 */

	if (DISPLAY_VER(dev_priv) >= 8 || IS_HASWELL_ULT(dev_priv))

		mask |= EDP_PSR_DEBUG_MASK_LPSP;



	if (DISPLAY_VER(dev_priv) < 20)

		mask |= EDP_PSR_DEBUG_MASK_MAX_SLEEP;