diff options
| author | Ken Chalmers <ken.chalmers@amd.com> | 2017-05-04 20:34:55 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-27 01:06:58 +0300 |
| commit | c0ba5ec70eff5cf0e4337b3864c94fa6b128c8d7 (patch) | |
| tree | b7906998ebb7c2951d904b20d5c8ccdfc0a0ea0d | |
| parent | cbfd33fd976eb2679c154e44fa34428a43ac8b44 (diff) | |
| download | linux-c0ba5ec70eff5cf0e4337b3864c94fa6b128c8d7.tar.xz | |
drm/amd/display: Continue with stream enable if DP link training fails.
Not necessarily a fatal problem - some monitors will recover and show
the stream anyway if link training fails.
Signed-off-by: Ken Chalmers <ken.chalmers@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-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.c | 21 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/core_status.h | 1 |
2 files changed, 18 insertions, 4 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 5d374cb8128b..ffc0eeaad175 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -1225,7 +1225,7 @@ static enum dc_status enable_link_dp(struct pipe_ctx *pipe_ctx) status = DC_OK; } else - status = DC_ERROR_UNEXPECTED; + status = DC_FAIL_DP_LINK_TRAINING; enable_stream_features(pipe_ctx); @@ -1833,9 +1833,22 @@ void core_link_enable_stream(struct pipe_ctx *pipe_ctx) { struct core_dc *core_dc = DC_TO_CORE(pipe_ctx->stream->ctx->dc); - if (DC_OK != enable_link(pipe_ctx)) { - BREAK_TO_DEBUGGER(); - return; + enum dc_status status = enable_link(pipe_ctx); + + if (status != DC_OK) { + dm_logger_write(pipe_ctx->stream->ctx->logger, + LOG_WARNING, "enabling link %u failed: %d\n", + pipe_ctx->stream->sink->link->public.link_index, + status); + + /* Abort stream enable *unless* the failure was due to + * DP link training - some DP monitors will recover and + * show the stream anyway. + */ + if (status != DC_FAIL_DP_LINK_TRAINING) { + BREAK_TO_DEBUGGER(); + return; + } } /* turn off otg test pattern if enable */ diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_status.h b/drivers/gpu/drm/amd/display/dc/inc/core_status.h index 128617dabc4a..b5759c0e5a2f 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/core_status.h +++ b/drivers/gpu/drm/amd/display/dc/inc/core_status.h @@ -41,6 +41,7 @@ enum dc_status { DC_SURFACE_PIXEL_FORMAT_UNSUPPORTED = 11, DC_FAIL_BANDWIDTH_VALIDATE = 12, /* BW and Watermark validation */ DC_FAIL_SCALING = 13, + DC_FAIL_DP_LINK_TRAINING = 14, DC_ERROR_UNEXPECTED = -1 }; |