drm/amd/display: eDP power sequence T9 fail

Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@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_hwss.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
index da880bd02ad796ac216b62fbb5b688b227213994..e12f1f9fb590e25ad5025cb727db0b601ecb19a9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
@@ -110,6 +110,28 @@ void dp_enable_link_phy(
        dp_receiver_power_ctrl(link, true);
 }
 
+bool edp_receiver_ready_T9(struct dc_link *link)
+{
+       unsigned int tries = 0;
+       unsigned char sinkstatus = 0;
+       unsigned char edpRev = 0;
+       enum dc_status result = DC_OK;
+       result = core_link_read_dpcd(link, DP_EDP_DPCD_REV, &edpRev, sizeof(edpRev));
+       if (edpRev < DP_EDP_12)
+               return true;
+       /* start from eDP version 1.2, SINK_STAUS indicate the sink is ready.*/
+       do {
+               sinkstatus = 1;
+               result = core_link_read_dpcd(link, DP_SINK_STATUS, &sinkstatus, sizeof(sinkstatus));
+               if (sinkstatus == 0)
+                       break;
+               if (result != DC_OK)
+                       break;
+               dm_delay_in_microseconds(link->ctx, 100); //MAx T9
+       } while (++tries < 50);
+       return result;
+}
+
 void dp_disable_link_phy(struct dc_link *link, enum signal_type signal)
 {
        if (!link->wa_flags.dp_keep_receiver_powered)
@@ -117,6 +139,7 @@ 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);
+               edp_receiver_ready_T9(link);
                link->link_enc->funcs->disable_output(link->link_enc, signal);
                link->link_enc->funcs->power_control(link->link_enc, false);
        } else

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
index 0dab5bacde3c16b9d2b140cc95d681f50bad8723..559a9f81c9c9ca150e0a219a1b42265d6c6a52f6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
@@ -744,7 +744,7 @@ void dce110_link_encoder_edp_backlight_control(
                return;
        }
 
-       if (!enable && !is_panel_powered_on(enc110)) {
+       if (!enable && !is_panel_backlight_on(enc110)) {
                dm_logger_write(ctx->logger, LOG_HW_RESUME_S3,
                                "%s: panel already powered down. Do nothing.\n",
                                __func__);