Skip to content

Commit a2cd15c

Browse files
mkaholahogander
authored andcommitted
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: Mika Kahola <mika.kahola@intel.com> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Signed-off-by: Jouni Högander <jouni.hogander@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231010095233.590613-1-mika.kahola@intel.com
1 parent d0c908d commit a2cd15c

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,9 @@ static void hsw_activate_psr1(struct intel_dp *intel_dp)
676676

677677
val |= EDP_PSR_IDLE_FRAMES(psr_compute_idle_frames(intel_dp));
678678

679-
val |= EDP_PSR_MAX_SLEEP_TIME(max_sleep_time);
679+
if (DISPLAY_VER(dev_priv) < 20)
680+
val |= EDP_PSR_MAX_SLEEP_TIME(max_sleep_time);
681+
680682
if (IS_HASWELL(dev_priv))
681683
val |= EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES;
682684

@@ -1400,8 +1402,10 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
14001402
*/
14011403
mask = EDP_PSR_DEBUG_MASK_MEMUP |
14021404
EDP_PSR_DEBUG_MASK_HPD |
1403-
EDP_PSR_DEBUG_MASK_LPSP |
1404-
EDP_PSR_DEBUG_MASK_MAX_SLEEP;
1405+
EDP_PSR_DEBUG_MASK_LPSP;
1406+
1407+
if (DISPLAY_VER(dev_priv) < 20)
1408+
mask |= EDP_PSR_DEBUG_MASK_MAX_SLEEP;
14051409

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

0 commit comments

Comments
 (0)