From e95652d303d0fb9a09f11dc28195118bc65e8ad7 Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Wed, 2 Dec 2015 22:38:58 -0500 Subject: [PATCH 0567/1110] drm/amd/dal: Fix issue where 2nd MST display didn't light up Fix breakage caused by link encoder refactoring. Signed-off-by: Harry Wentland Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_link.c b/drivers/gpu/drm/amd/dal/dc/core/dc_link.c index ad890a5..44b3a2b 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link.c @@ -1022,9 +1022,10 @@ static enum dc_status enable_link(struct core_stream *stream) static void disable_link(struct core_stream *stream) { - /* TODO dp_set_hw_test_pattern */ struct dc *dc = stream->ctx->dc; + /* TODO dp_set_hw_test_pattern */ + /* here we need to specify that encoder output settings * need to be calculated as for the set mode, * it will lead to querying dynamic link capabilities @@ -1039,9 +1040,10 @@ static void disable_link(struct core_stream *stream) dp_disable_link_phy_mst( stream->sink->link, stream); } + } else { + dc->hwss.encoder_disable_output( + stream->sink->link->link_enc, stream->signal); } - dc->hwss.encoder_disable_output( - stream->sink->link->link_enc, stream->signal); } enum dc_status dc_link_validate_mode_timing( -- 2.7.4