Revert "drm/amd/display: Improve DisplayPort monitor interop"

This reverts commit 1adb2ff1f6b170cdbc3925a359c8f39d2215dc20.

This breaks display wake up in stable kernels (5.7.x and 5.8.x).

Note that there is no upstream equivalent to this
revert. This patch was targeted for stable by Sasha's stable
patch process. Presumably there are some other changes necessary
for this patch to work properly on stable kernels.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1266
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.7.x, 5.8.x
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 5cdee6c97c5c5a6c8c785e7b8de7b1e1f2e201cf..92079e2fa515a9a984ac0edbd6ef799c63c0e3b3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -3145,11 +3145,9 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx)
                        write_i2c_redriver_setting(pipe_ctx, false);
                }
        }
-
-       disable_link(pipe_ctx->stream->link, pipe_ctx->stream->signal);
-
        dc->hwss.disable_stream(pipe_ctx);
 
+       disable_link(pipe_ctx->stream->link, pipe_ctx->stream->signal);
        if (pipe_ctx->stream->timing.flags.DSC) {
                if (dc_is_dp_signal(pipe_ctx->stream->signal))
                        dp_set_dsc_enable(pipe_ctx, false);

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 1ada01322cd2cb766ffac7b89b0604e9d9289689..caa090d0b6acc6549186f96a850edbf60ad46343 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
@@ -1103,10 +1103,6 @@ static inline enum link_training_result perform_link_training_int(
        dpcd_pattern.v1_4.TRAINING_PATTERN_SET = DPCD_TRAINING_PATTERN_VIDEOIDLE;
        dpcd_set_training_pattern(link, dpcd_pattern);
 
-       /* delay 5ms after notifying sink of idle pattern before switching output */
-       if (link->connector_signal != SIGNAL_TYPE_EDP)
-               msleep(5);
-
        /* 4. mainlink output idle pattern*/
        dp_set_hw_test_pattern(link, DP_TEST_PATTERN_VIDEO_MODE, NULL, 0);
 
@@ -1556,12 +1552,6 @@ bool perform_link_training_with_retries(
        struct dc_link *link = stream->link;
        enum dp_panel_mode panel_mode = dp_get_panel_mode(link);
 
-       /* We need to do this before the link training to ensure the idle pattern in SST
-        * mode will be sent right after the link training
-        */
-       link->link_enc->funcs->connect_dig_be_to_fe(link->link_enc,
-                                                       pipe_ctx->stream_res.stream_enc->id, true);
-
        for (j = 0; j < attempts; ++j) {
 
                dp_enable_link_phy(
@@ -1578,6 +1568,12 @@ bool perform_link_training_with_retries(
 
                dp_set_panel_mode(link, panel_mode);
 
+               /* We need to do this before the link training to ensure the idle pattern in SST
+                * mode will be sent right after the link training
+                */
+               link->link_enc->funcs->connect_dig_be_to_fe(link->link_enc,
+                                                               pipe_ctx->stream_res.stream_enc->id, true);
+
                if (link->aux_access_disabled) {
                        dc_link_dp_perform_link_training_skip_aux(link, link_setting);
                        return true;

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 24ca592c90df59478a59269815ca7e46419c2792..10527593868cc91031c48031c9d5532f4f0d5dd0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1090,17 +1090,8 @@ void dce110_blank_stream(struct pipe_ctx *pipe_ctx)
                dc_link_set_abm_disable(link);
        }
 
-       if (dc_is_dp_signal(pipe_ctx->stream->signal)) {
+       if (dc_is_dp_signal(pipe_ctx->stream->signal))
                pipe_ctx->stream_res.stream_enc->funcs->dp_blank(pipe_ctx->stream_res.stream_enc);
-
-               /*
-                * After output is idle pattern some sinks need time to recognize the stream
-                * has changed or they enter protection state and hang.
-                */
-               if (!dc_is_embedded_signal(pipe_ctx->stream->signal))
-                       msleep(60);
-       }
-
 }