aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Tsai <[email protected]>2017-09-08 19:25:35 +0800
committerAlex Deucher <[email protected]>2017-10-21 16:40:21 -0400
commit7d58e72149fa73504fa13e7044d68e79a39996fb (patch)
treed4531f551f11357bec5f074312b34dd22421b69d
parente008b0bcc63793d3e42fd88f412a90f329a05865 (diff)
drm/amd/display: To prevent detecting new sink from spurious HPD
Signed-off-by: Martin Tsai <[email protected]> Reviewed-by: Tony Cheng <[email protected]> Acked-by: Harry Wentland <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c33
-rw-r--r--drivers/gpu/drm/amd/display/dc/dc_types.h1
2 files changed, 21 insertions, 13 deletions
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 d5eaebeaeb89..c7751a31081a 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -649,27 +649,34 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
sink_init_data.link = link;
sink_init_data.sink_signal = sink_caps.signal;
- if (link->local_sink) {
- sink = link->local_sink;
- } else {
- sink_init_data.link = link;
- sink_init_data.sink_signal = sink_caps.signal;
+ sink = dc_sink_create(&sink_init_data);
+ if (!sink) {
+ DC_ERROR("Failed to create sink!\n");
+ return false;
+ }
- sink = dc_sink_create(&sink_init_data);
- if (!sink) {
- DC_ERROR("Failed to create sink!\n");
- return false;
+ if (link->local_sink) {
+ edid_status = dm_helpers_read_local_edid(
+ link->ctx,
+ link,
+ sink);
+
+ if (edid_status == EDID_OK) {
+ // Edid is not the same, to update the local sink with new sink.
+ sink->dongle_max_pix_clk = sink_caps.max_hdmi_pixel_clock;
+ sink->converter_disable_audio = converter_disable_audio;
+ link->local_sink = sink;
}
+ } else {
sink->dongle_max_pix_clk = sink_caps.max_hdmi_pixel_clock;
sink->converter_disable_audio = converter_disable_audio;
-
link->local_sink = sink;
- }
- edid_status = dm_helpers_read_local_edid(
+ edid_status = dm_helpers_read_local_edid(
link->ctx,
link,
sink);
+ }
switch (edid_status) {
case EDID_BAD_CHECKSUM:
@@ -762,7 +769,7 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
link->ctx,
link,
sink);
- if (edid_status != EDID_OK) {
+ if (edid_status != EDID_OK && edid_status != EDID_THE_SAME) {
link_disconnect_sink(link);
link->type = dc_connection_none;
sink_caps.signal = SIGNAL_TYPE_NONE;
diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 6b891fde400c..4bd74fc6c782 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -151,6 +151,7 @@ enum dc_edid_status {
EDID_BAD_INPUT,
EDID_NO_RESPONSE,
EDID_BAD_CHECKSUM,
+ EDID_THE_SAME,
};
/* audio capability from EDID*/