From 4554a97db5ddf1d01abe5827991fb847b55463ff Mon Sep 17 00:00:00 2001 From: Charlene Liu Date: Thu, 3 Aug 2017 13:04:44 -0400 Subject: [PATCH 0733/4131] drm/amd/display: fix eDP power down sequence Signed-off-by: Charlene Liu Reviewed-by: Anthony Koo Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c index 8225687..d19c663 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c @@ -90,10 +90,13 @@ void dp_enable_link_phy( if (dc_is_dp_sst_signal(signal)) { if (signal == SIGNAL_TYPE_EDP) { link_enc->funcs->power_control(link_enc, true); + link_enc->funcs->enable_dp_output( + link_enc, + link_settings, + clock_source); link_enc->funcs->backlight_control(link_enc, true); - } - - link_enc->funcs->enable_dp_output( + } else + link_enc->funcs->enable_dp_output( link_enc, link_settings, clock_source); @@ -114,10 +117,10 @@ void dp_disable_link_phy(struct dc_link *link, enum signal_type signal) if (signal == SIGNAL_TYPE_EDP) { link->link_enc->funcs->backlight_control(link->link_enc, false); + link->link_enc->funcs->disable_output(link->link_enc, signal); link->link_enc->funcs->power_control(link->link_enc, false); - } - - link->link_enc->funcs->disable_output(link->link_enc, signal); + } else + link->link_enc->funcs->disable_output(link->link_enc, signal); /* Clear current link setting.*/ memset(&link->cur_link_settings, 0, -- 2.7.4