Skip to content

Commit 69f83f1

Browse files
hoganderjlahtine-intel
authored andcommitted
drm/i915/psr: Don't enable Panel Replay on sink if globally disabled
With some panels informing support for Panel Replay we are observing problems if having Panel Replay enable bit set on sink when forced to use PSR instead of Panel Replay. Avoid these problems by not setting Panel Replay enable bit in sink when Panel Replay is globally disabled during link training. I.e. disabled by module parameter. The enable bit is still set when disabling Panel Replay via debugfs interface. Added note comment about this. Fixes: 68f3a50 ("drm/i915/psr: Enable Panel Replay on sink always when it's supported") Cc: Mika Kahola <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: <[email protected]> # v6.15+ Signed-off-by: Jouni Högander <[email protected]> Reviewed-by: Mika Kahola <[email protected]> Link: https://patch.msgid.link/[email protected] (cherry picked from commit c5a52cd) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 95adee9 commit 69f83f1

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,12 @@ static void intel_psr_enable_sink(struct intel_dp *intel_dp,
842842

843843
void intel_psr_panel_replay_enable_sink(struct intel_dp *intel_dp)
844844
{
845-
if (CAN_PANEL_REPLAY(intel_dp))
845+
/*
846+
* NOTE: We might want to trigger mode set when
847+
* disabling/enabling Panel Replay via debugfs interface to
848+
* ensure this bit is cleared/set accordingly.
849+
*/
850+
if (CAN_PANEL_REPLAY(intel_dp) && panel_replay_global_enabled(intel_dp))
846851
drm_dp_dpcd_writeb(&intel_dp->aux, PANEL_REPLAY_CONFIG,
847852
DP_PANEL_REPLAY_ENABLE);
848853
}

0 commit comments

Comments
 (0)