From: Amy Zhang <Amy.Zhang@amd.com>
Date: Wed, 24 May 2017 18:53:50 +0000 (-0400)
Subject: drm/amd/display: Disable PSR entry abort to prevent intermittent freezes
X-Git-Tag: v5.15~9960^2~23^2~456
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ece22899a46551dcd8e9f3296ce1ec8ac9e07dc4;p=platform%2Fkernel%2Flinux-starfive.git

drm/amd/display: Disable PSR entry abort to prevent intermittent freezes

Signed-off-by: Amy Zhang <Amy.Zhang@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

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 5997764..79f3947 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
 		 */