drm/amd/display: Add hpd pending flag to indicate detection of new hpd

[Why]
For dpia link, link->hpd_status indicates current state, but driver
fails to capture hpd transitions in certain scenarios such as during
link training.

[How]
Added link->hpd_pending flag that captures arrival of new hpd.

Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Anson Jacob <Anson.Jacob@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Meenakshikumar Somasundaram <meenakshikumar.somasundaram@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 c4944ba59ec664e38f7048d3b57ec6ee6eebf0c3..2e2dcd5518da24749bdd269b39432aad8a2bb088 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -270,10 +270,10 @@ bool dc_link_detect_sink(struct dc_link *link, enum dc_connection_type *type)
 
        /* Link may not have physical HPD pin. */
        if (link->ep_type != DISPLAY_ENDPOINT_PHY) {
-               if (link->hpd_status)
-                       *type = dc_connection_single;
-               else
+               if (link->is_hpd_pending || !link->hpd_status)
                        *type = dc_connection_none;
+               else
+                       *type = dc_connection_single;
 
                return true;
        }

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c
index b1c9f77d6bf4331681b1b4dc7592c7257275fce2..d721225939594028b539daa089b9d2c798c5c449 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c
@@ -94,17 +94,17 @@ static enum link_training_result dpia_configure_link(struct dc_link *link,
                lt_settings);
 
        status = dpcd_configure_channel_coding(link, lt_settings);
-       if (status != DC_OK && !link->hpd_status)
+       if (status != DC_OK && link->is_hpd_pending)
                return LINK_TRAINING_ABORT;
 
        /* Configure lttpr mode */
        status = dpcd_configure_lttpr_mode(link, lt_settings);
-       if (status != DC_OK && !link->hpd_status)
+       if (status != DC_OK && link->is_hpd_pending)
                return LINK_TRAINING_ABORT;
 
        /* Set link rate, lane count and spread. */
        status = dpcd_set_link_settings(link, lt_settings);
-       if (status != DC_OK && !link->hpd_status)
+       if (status != DC_OK && link->is_hpd_pending)
                return LINK_TRAINING_ABORT;
 
        if (link->preferred_training_settings.fec_enable)
@@ -112,7 +112,7 @@ static enum link_training_result dpia_configure_link(struct dc_link *link,
        else
                fec_enable = true;
        status = dp_set_fec_ready(link, fec_enable);
-       if (status != DC_OK && !link->hpd_status)
+       if (status != DC_OK && link->is_hpd_pending)
                return LINK_TRAINING_ABORT;
 
        return LINK_TRAINING_SUCCESS;
@@ -388,7 +388,7 @@ static enum link_training_result dpia_training_cr_non_transparent(struct dc_link
        }
 
        /* Abort link training if clock recovery failed due to HPD unplug. */
-       if (!link->hpd_status)
+       if (link->is_hpd_pending)
                result = LINK_TRAINING_ABORT;
 
        DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) clock recovery\n"
@@ -490,7 +490,7 @@ static enum link_training_result dpia_training_cr_transparent(struct dc_link *li
        }
 
        /* Abort link training if clock recovery failed due to HPD unplug. */
-       if (!link->hpd_status)
+       if (link->is_hpd_pending)
                result = LINK_TRAINING_ABORT;
 
        DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) clock recovery\n"
@@ -675,7 +675,7 @@ static enum link_training_result dpia_training_eq_non_transparent(struct dc_link
        }
 
        /* Abort link training if equalization failed due to HPD unplug. */
-       if (!link->hpd_status)
+       if (link->is_hpd_pending)
                result = LINK_TRAINING_ABORT;
 
        DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) equalization\n"
@@ -758,7 +758,7 @@ static enum link_training_result dpia_training_eq_transparent(struct dc_link *li
        }
 
        /* Abort link training if equalization failed due to HPD unplug. */
-       if (!link->hpd_status)
+       if (link->is_hpd_pending)
                result = LINK_TRAINING_ABORT;
 
        DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) equalization\n"
@@ -892,10 +892,10 @@ static void dpia_training_abort(struct dc_link *link, uint32_t hop)
                                __func__,
                                link->link_id.enum_id - ENUM_ID_1,
                                link->lttpr_mode,
-                               link->hpd_status);
+                               link->is_hpd_pending);
 
        /* Abandon clean-up if sink unplugged. */
-       if (!link->hpd_status)
+       if (link->is_hpd_pending)
                return;
 
        if (hop != DPRX)

diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h
index b732398dac898e4e10f69f0828d8942677ae309c..d449e72a4e2a92c675d4034b8a059749d0206953 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_link.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_link.h
@@ -113,6 +113,7 @@ struct dc_link {
         * DIG encoder. */
        bool is_dig_mapping_flexible;
        bool hpd_status; /* HPD status of link without physical HPD pin. */
+       bool is_hpd_pending; /* Indicates a new received hpd */
 
        bool edp_sink_present;