Commit a2cd15c2 authored by Mika Kahola's avatar Mika Kahola Committed by Jouni Högander
Browse files

drm/i915/lnl: Remove watchdog timers for PSR 



Watchdog timers for Lunarlake HW were removed for PSR/PSR2
The patch removes the use of these timers from the driver code.

BSpec: 69895

v2: Reword commit message (Ville)
    Drop HPD mask from LNL (Ville)
    Revise masking logic (Jouni)
v3: Revise commit message (Ville)
    Revert HPD mask removal as irrelevant for this patch (Ville)

Signed-off-by: default avatarMika Kahola <mika.kahola@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231010095233.590613-1-mika.kahola@intel.com
parent d0c908d2

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

+7 −3
Original line number Diff line number Diff line
@@ -676,7 +676,9 @@ static void hsw_activate_psr1(struct intel_dp *intel_dp) 


	val |= EDP_PSR_IDLE_FRAMES(psr_compute_idle_frames(intel_dp));



	if (DISPLAY_VER(dev_priv) < 20)

		val |= EDP_PSR_MAX_SLEEP_TIME(max_sleep_time);



	if (IS_HASWELL(dev_priv))

		val |= EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES;
@@ -1400,8 +1402,10 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, 
	 */

	mask = EDP_PSR_DEBUG_MASK_MEMUP |

	       EDP_PSR_DEBUG_MASK_HPD |

	       EDP_PSR_DEBUG_MASK_LPSP |

	       EDP_PSR_DEBUG_MASK_MAX_SLEEP;

	       EDP_PSR_DEBUG_MASK_LPSP;



	if (DISPLAY_VER(dev_priv) < 20)

		mask |= EDP_PSR_DEBUG_MASK_MAX_SLEEP;



	/*

	 * No separate pipe reg write mask on hsw/bdw, so have to unmask all