From: Amy Zhang <Amy.Zhang@xxxxxxx> Change-Id: I8beaae4b027868ed3a088d89b2396b0097611830 Signed-off-by: Amy Zhang <Amy.Zhang at amd.com> Reviewed-by: Tony Cheng <Tony.Cheng at amd.com> Acked-by: Harry Wentland <Harry.Wentland at amd.com> --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 59977640f938..79f3947a3ee1 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -1550,6 +1550,11 @@ bool dc_link_setup_psr(const struct dc_link *dc_link, */ psr_context.psr_level.bits.SKIP_SMU_NOTIFICATION = 1; + /* Complete PSR entry before aborting to prevent intermittent + * freezes on certain eDPs + */ + psr_context.psr_level.bits.DISABLE_PSR_ENTRY_ABORT = 1; + /* Controls additional delay after remote frame capture before * continuing power down, default = 0 */ -- 2.11.0