drm/amd/display: Add link dp trace support

[Why]
It is nice to have link training and link loss status logging in
our trace, and this patch add the all necessary accessors in dc
side.

[How]
1. Define dp_trace struct and create new file link_dp_trace.c and
link_dp_trace.h;
2. Add dp link training status update in dc_link_dp.c;

Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Acked-by: Alan Liu <HaoPing.Liu@amd.com>
Signed-off-by: Leo (Hanghong) Ma <hanghong.ma@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@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 b2ed2b683ba55798d5028a7d481c4bebf77b4358..1951a92e34173065a686c40826666057c600f359 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -50,6 +50,7 @@
 #include "inc/hw/panel_cntl.h"
 #include "inc/link_enc_cfg.h"
 #include "inc/link_dpcd.h"
+#include "link/link_dp_trace.h"
 
 #include "dc/dcn30/dcn30_vpg.h"
 
@@ -1255,6 +1256,9 @@ static bool detect_link_and_local_sink(struct dc_link *link,
                    !sink->edid_caps.edid_hdmi)
                        sink->sink_signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
 
+               if (link->local_sink && dc_is_dp_signal(sink_caps.signal))
+                       dp_trace_init(link);
+
                /* Connectivity log: detection */
                for (i = 0; i < sink->dc_edid.length / DC_EDID_BLOCK_SIZE; i++) {
                        CONN_DATA_DETECT(link,
@@ -1307,6 +1311,7 @@ static bool detect_link_and_local_sink(struct dc_link *link,
                link->dongle_max_pix_clk = 0;
 
                dc_link_clear_dprx_states(link);
+               dp_trace_reset(link);
        }
 
        LINK_INFO("link=%d, dc_sink_in=%p is now %s prev_sink=%p edid same=%d\n",

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 6a213467c97ce2a2c948cdac3a58284ea0095253..0e84c54dc67eab36e4bd123341db1c8e5ab4bc67 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -39,6 +39,7 @@
 #include "dce/dmub_hw_lock_mgr.h"
 #include "inc/dc_link_dpia.h"
 #include "inc/link_enc_cfg.h"
+#include "link/link_dp_trace.h"
 
 /*Travis*/
 static const uint8_t DP_VGA_LVDS_CONVERTER_ID_2[] = "sivarT";
@@ -2776,6 +2777,10 @@ bool perform_link_training_with_retries(
        enum link_training_result status = LINK_TRAINING_CR_FAIL_LANE0;
        struct dc_link_settings current_setting = *link_setting;
        const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
+       int fail_count = 0;
+
+       dp_trace_commit_lt_init(link);
+
 
        if (dp_get_link_encoding_format(&current_setting) == DP_8b_10b_ENCODING)
                /* We need to do this before the link training to ensure the idle
@@ -2783,6 +2788,7 @@ bool perform_link_training_with_retries(
                 */
                link_hwss->setup_stream_encoder(pipe_ctx);
 
+       dp_trace_set_lt_start_timestamp(link, false);
        for (j = 0; j < attempts; ++j) {
 
                DC_LOG_HW_LINK_TRAINING("%s: Beginning link training attempt %u of %d\n",
@@ -2838,10 +2844,15 @@ bool perform_link_training_with_retries(
                                                skip_video_pattern);
                        }
 
+                       dp_trace_lt_total_count_increment(link, false);
+                       dp_trace_lt_result_update(link, status, false);
+                       dp_trace_set_lt_end_timestamp(link, false);
                        if (status == LINK_TRAINING_SUCCESS)
                                return true;
                }
 
+               fail_count++;
+               dp_trace_lt_fail_count_update(link, fail_count, false);
                /* latest link training still fail, skip delay and keep PHY on
                 */
                if (j == (attempts - 1) && link->ep_type == DISPLAY_ENDPOINT_PHY)
@@ -3309,6 +3320,8 @@ static bool dp_verify_link_cap(
                } else {
                        (*fail_count)++;
                }
+               dp_trace_lt_total_count_increment(link, true);
+               dp_trace_lt_result_update(link, status, true);
                dp_disable_link_phy(link, &link_res, link->connector_signal);
        } while (!success && decide_fallback_link_setting(link,
                        initial_link_settings, &cur_link_settings, status));
@@ -3340,13 +3353,16 @@ bool dp_verify_link_cap_with_retries(
 {
        int i = 0;
        bool success = false;
+       int fail_count = 0;
+
+       dp_trace_detect_lt_init(link);
 
        if (link->link_enc && link->link_enc->features.flags.bits.DP_IS_USB_C &&
                        link->dc->debug.usbc_combo_phy_reset_wa)
                apply_usbc_combo_phy_reset_wa(link, known_limit_link_setting);
 
+       dp_trace_set_lt_start_timestamp(link, false);
        for (i = 0; i < attempts; i++) {
-               int fail_count = 0;
                enum dc_connection_type type = dc_connection_none;
 
                memset(&link->verified_link_cap, 0,
@@ -3361,6 +3377,10 @@ bool dp_verify_link_cap_with_retries(
                }
                msleep(10);
        }
+
+       dp_trace_lt_fail_count_update(link, fail_count, true);
+       dp_trace_set_lt_end_timestamp(link, true);
+
        return success;
 }
 
@@ -4627,6 +4647,8 @@ bool dc_link_handle_hpd_rx_irq(struct dc_link *link, union hpd_irq_data *out_hpd
                status = false;
                if (out_link_loss)
                        *out_link_loss = true;
+
+               dp_trace_link_loss_increment(link);
        }
 
        if (link->type == dc_connection_sst_branch &&

diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h
index ce6e8d013459a7b5c34bf0b0b2d42fd8fabfa27a..78e66e4bab5a3de39492bf6f0f76eecfde05feef 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_link.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_link.h
@@ -76,6 +76,28 @@ struct link_trace {
        struct time_stamp time_stamp;
 };
 
+struct dp_trace_lt_counts {
+       unsigned int total;
+       unsigned int fail;
+};
+
+struct dp_trace_lt {
+       struct dp_trace_lt_counts counts;
+       struct dp_trace_timestamps {
+               unsigned long long start;
+               unsigned long long end;
+       } timestamps;
+       enum link_training_result result;
+       bool is_logged;
+};
+
+struct dp_trace {
+       struct dp_trace_lt detect_lt_trace;
+       struct dp_trace_lt commit_lt_trace;
+       unsigned int link_loss_count;
+       bool is_initialized;
+};
+
 /* PSR feature flags */
 struct psr_settings {
        bool psr_feature_enabled;               // PSR is supported by sink
@@ -121,6 +143,8 @@ struct dc_link {
 
        bool edp_sink_present;
 
+       struct dp_trace dp_trace;
+
        /* caps is the same as reported_link_cap. link_traing use
         * reported_link_cap. Will clean up.  TODO
         */
@@ -470,4 +494,16 @@ void dc_link_clear_dprx_states(struct dc_link *link);
 struct gpio *get_hpd_gpio(struct dc_bios *dcb,
                struct graphics_object_id link_id,
                struct gpio_service *gpio_service);
+void dp_trace_reset(struct dc_link *link);
+bool dc_dp_trace_is_initialized(struct dc_link *link);
+unsigned long long dc_dp_trace_get_lt_end_timestamp(struct dc_link *link,
+               bool in_detection);
+void dc_dp_trace_set_is_logged_flag(struct dc_link *link,
+               bool in_detection,
+               bool is_logged);
+bool dc_dp_trace_is_logged(struct dc_link *link,
+               bool in_detection);
+struct dp_trace_lt_counts *dc_dp_trace_get_lt_counts(struct dc_link *link,
+               bool in_detection);
+unsigned int dc_dp_trace_get_link_loss_count(struct dc_link *link);
 #endif /* DC_LINK_H_ */

diff --git a/drivers/gpu/drm/amd/display/dc/link/Makefile b/drivers/gpu/drm/amd/display/dc/link/Makefile
index c4a69ba7cb62f8ebb7f1105fcc7272dcd1cccbf6..054c2a727eb22da8d2dd88f0282803b75008b593 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/link/Makefile
@@ -23,7 +23,7 @@
 # It abstracts the control and status of back end pipe such as DIO, HPO, DPIA,
 # PHY, HPD, DDC and etc).
 
-LINK = link_hwss_dio.o link_hwss_dpia.o link_hwss_hpo_dp.o
+LINK = link_hwss_dio.o link_hwss_dpia.o link_hwss_hpo_dp.o link_dp_trace.o
 
 AMD_DAL_LINK = $(addprefix $(AMDDALPATH)/dc/link/,$(LINK))
 

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_dp_trace.c b/drivers/gpu/drm/amd/display/dc/link/link_dp_trace.c
new file mode 100644 (file)
index 0000000..e704739
--- /dev/null
+++ b/drivers/gpu/drm/amd/display/dc/link/link_dp_trace.c
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2022 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: AMD
+ *
+ */
+#include "dc_link.h"
+#include "link_dp_trace.h"
+
+void dp_trace_init(struct dc_link *link)
+{
+       memset(&link->dp_trace, 0, sizeof(link->dp_trace));
+       link->dp_trace.is_initialized = true;
+}
+
+void dp_trace_reset(struct dc_link *link)
+{
+       memset(&link->dp_trace, 0, sizeof(link->dp_trace));
+}
+
+bool dc_dp_trace_is_initialized(struct dc_link *link)
+{
+       return link->dp_trace.is_initialized;
+}
+
+void dp_trace_detect_lt_init(struct dc_link *link)
+{
+       memset(&link->dp_trace.detect_lt_trace, 0, sizeof(link->dp_trace.detect_lt_trace));
+}
+
+void dp_trace_commit_lt_init(struct dc_link *link)
+{
+       memset(&link->dp_trace.commit_lt_trace, 0, sizeof(link->dp_trace.commit_lt_trace));
+}
+
+void dp_trace_link_loss_increment(struct dc_link *link)
+{
+       link->dp_trace.link_loss_count++;
+}
+
+void dp_trace_lt_fail_count_update(struct dc_link *link,
+               unsigned int fail_count,
+               bool in_detection)
+{
+       if (in_detection)
+               link->dp_trace.detect_lt_trace.counts.fail = fail_count;
+       else
+               link->dp_trace.commit_lt_trace.counts.fail = fail_count;
+}
+
+void dp_trace_lt_total_count_increment(struct dc_link *link,
+               bool in_detection)
+{
+       if (in_detection)
+               link->dp_trace.detect_lt_trace.counts.total++;
+       else
+               link->dp_trace.commit_lt_trace.counts.total++;
+}
+
+void dc_dp_trace_set_is_logged_flag(struct dc_link *link,
+               bool in_detection,
+               bool is_logged)
+{
+       if (in_detection)
+               link->dp_trace.detect_lt_trace.is_logged = is_logged;
+       else
+               link->dp_trace.commit_lt_trace.is_logged = is_logged;
+}
+
+bool dc_dp_trace_is_logged(struct dc_link *link,
+               bool in_detection)
+{
+       if (in_detection)
+               return link->dp_trace.detect_lt_trace.is_logged;
+       else
+               return link->dp_trace.commit_lt_trace.is_logged;
+}
+
+void dp_trace_lt_result_update(struct dc_link *link,
+               enum link_training_result result,
+               bool in_detection)
+{
+       if (in_detection)
+               link->dp_trace.detect_lt_trace.result = result;
+       else
+               link->dp_trace.commit_lt_trace.result = result;
+}
+
+void dp_trace_set_lt_start_timestamp(struct dc_link *link,
+               bool in_detection)
+{
+       if (in_detection)
+               link->dp_trace.detect_lt_trace.timestamps.start = dm_get_timestamp(link->dc->ctx);
+       else
+               link->dp_trace.commit_lt_trace.timestamps.start = dm_get_timestamp(link->dc->ctx);
+}
+
+void dp_trace_set_lt_end_timestamp(struct dc_link *link,
+               bool in_detection)
+{
+       if (in_detection)
+               link->dp_trace.detect_lt_trace.timestamps.end = dm_get_timestamp(link->dc->ctx);
+       else
+               link->dp_trace.commit_lt_trace.timestamps.end = dm_get_timestamp(link->dc->ctx);
+}
+
+unsigned long long dc_dp_trace_get_lt_end_timestamp(struct dc_link *link,
+               bool in_detection)
+{
+       if (in_detection)
+               return link->dp_trace.detect_lt_trace.timestamps.end;
+       else
+               return link->dp_trace.commit_lt_trace.timestamps.end;
+}
+
+struct dp_trace_lt_counts *dc_dp_trace_get_lt_counts(struct dc_link *link,
+               bool in_detection)
+{
+       if (in_detection)
+               return &link->dp_trace.detect_lt_trace.counts;
+       else
+               return &link->dp_trace.commit_lt_trace.counts;
+}
+
+unsigned int dc_dp_trace_get_link_loss_count(struct dc_link *link)
+{
+       return link->dp_trace.link_loss_count;
+}

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_dp_trace.h b/drivers/gpu/drm/amd/display/dc/link/link_dp_trace.h
new file mode 100644 (file)
index 0000000..702f97c
--- /dev/null
+++ b/drivers/gpu/drm/amd/display/dc/link/link_dp_trace.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: AMD
+ *
+ */
+#ifndef __LINK_DP_TRACE_H__
+#define __LINK_DP_TRACE_H__
+
+void dp_trace_init(struct dc_link *link);
+void dp_trace_reset(struct dc_link *link);
+bool dc_dp_trace_is_initialized(struct dc_link *link);
+void dp_trace_detect_lt_init(struct dc_link *link);
+void dp_trace_commit_lt_init(struct dc_link *link);
+void dp_trace_link_loss_increment(struct dc_link *link);
+void dp_trace_lt_fail_count_update(struct dc_link *link,
+               unsigned int fail_count,
+               bool in_detection);
+void dp_trace_lt_total_count_increment(struct dc_link *link,
+               bool in_detection);
+void dc_dp_trace_set_is_logged_flag(struct dc_link *link,
+               bool in_detection,
+               bool is_logged);
+bool dc_dp_trace_is_logged(struct dc_link *link,
+               bool in_detection);
+void dp_trace_lt_result_update(struct dc_link *link,
+               enum link_training_result result,
+               bool in_detection);
+void dp_trace_set_lt_start_timestamp(struct dc_link *link,
+               bool in_detection);
+void dp_trace_set_lt_end_timestamp(struct dc_link *link,
+               bool in_detection);
+unsigned long long dc_dp_trace_get_lt_end_timestamp(struct dc_link *link,
+               bool in_detection);
+struct dp_trace_lt_counts *dc_dp_trace_get_lt_counts(struct dc_link *link,
+               bool in_detection);
+unsigned int dc_dp_trace_get_link_loss_count(struct dc_link *link);
+
+#endif /* __LINK_DP_TRACE_H__ */