From d0cba8cced836a355e30dfccf70c90f3ee7d39fa Mon Sep 17 00:00:00 2001 From: Dmytro Laktyushkin Date: Mon, 30 Nov 2015 16:50:11 -0500 Subject: [PATCH 0541/1110] drm/amd/dal: add active dongle downstream hotplug handling Signed-off-by: Dmytro Laktyushkin Signed-off-by: Harry Wentland Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/dc/core/dc.c | 16 ++++++++-------- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 8 +++----- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc.c b/drivers/gpu/drm/amd/dal/dc/core/dc.c index 286bdde..60cbb47 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc.c @@ -839,17 +839,17 @@ void dc_link_remove_sink(struct dc_link *link, const struct dc_sink *sink) int i; if (!link->sink_count) { - BREAK_TO_DEBUGGER(); - return; + BREAK_TO_DEBUGGER(); + return; } for (i = 0; i < link->sink_count; i++) { - if (link->sink[i] == sink) { - dc_sink_release(sink); - link->sink[i] = NULL; - link->sink_count--; - return; - } + if (link->sink[i] == sink) { + dc_sink_release(sink); + link->sink[i] = NULL; + link->sink_count--; + return; + } } BREAK_TO_DEBUGGER(); 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 2ae41c7..ba087b3 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link.c @@ -355,9 +355,7 @@ static bool is_dp_active_dongle(enum display_dongle_type dongle_type) dongle_type == DISPLAY_DONGLE_DP_HDMI_CONVERTER); } -/* TODO: To beretired because this call is wrong with - * pluging in of active-dongle without display*/ -static void link_unplug(struct core_link *link) +static void link_disconnect_all_sinks(struct core_link *link) { int i; @@ -476,7 +474,7 @@ void dc_link_detect(const struct dc_link *dc_link) /* active dongle unplug * processing for short irq */ - link_unplug(link); + link_disconnect_all_sinks(link); return; } @@ -640,7 +638,7 @@ void dc_link_detect(const struct dc_link *dc_link) default: break; } - link_unplug(link); + link_disconnect_all_sinks(link); } LINK_INFO("link=%d, dc_sink_in=%p is now %s\n", -- 2.7.4