diff options
| author | Eric Yang <Eric.Yang2@amd.com> | 2017-11-01 20:43:47 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-11-14 17:32:46 +0100 |
| commit | 00f713c6dc657397ba37b42d7f6887f526c730c6 (patch) | |
| tree | 492fc0db4fc5d7b417cb9e6a39580bce0ccbc33a /drivers/gpu | |
| parent | drm/amd/display: Fix formatting for null pointer dereference fix (diff) | |
| download | linux-00f713c6dc657397ba37b42d7f6887f526c730c6.tar.xz linux-00f713c6dc657397ba37b42d7f6887f526c730c6.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 |
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; } |