summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Yang <Eric.Yang2@amd.com>2017-11-01 15:43:47 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-11-14 11:32:46 -0500
commit00f713c6dc657397ba37b42d7f6887f526c730c6 (patch)
tree492fc0db4fc5d7b417cb9e6a39580bce0ccbc33a
parent82e9781053c8a6aa3515aea3ade76546afb4c082 (diff)
drm/amd/display: fix MST link training fail division by 0
When link training fail in MST case, we will divide by 0 when calculating avg_time_slots_per_mtp, so we cannot proceed. Signed-off-by: Eric Yang <Eric.Yang2@amd.com> Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c6
1 files changed, 4 insertions, 2 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 e70612eaf257..0602610489d7 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -2318,9 +2318,11 @@ void core_link_enable_stream(
/* Abort stream enable *unless* the failure was due to
* DP link training - some DP monitors will recover and
- * show the stream anyway.
+ * show the stream anyway. But MST displays can't proceed
+ * without link training.
*/
- if (status != DC_FAIL_DP_LINK_TRAINING) {
+ if (status != DC_FAIL_DP_LINK_TRAINING ||
+ pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
BREAK_TO_DEBUGGER();
return;
}