From 353db359b8fc2399abbb4ef45f05a94c46b53caf Mon Sep 17 00:00:00 2001 From: Yongqiang Sun Date: Thu, 17 Dec 2015 16:13:59 -0500 Subject: [PATCH 1201/1565] drm/amd/dal: Modifed check conditions for switch dp clock source. Change-Id: I63be0b2a856c6e16f1c31563a32330939798cdc3 Signed-off-by: Yongqiang Sun Acked-by: Jordan Lazare --- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 2 +- drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c b/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c index 861d80a8..ef13968 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c @@ -71,7 +71,7 @@ static bool is_sharable_clk_src( if (stream_with_clk_src->clock_source == NULL) return false; - if (!dc_is_dp_signal(stream->signal) && id == CLOCK_SOURCE_ID_EXTERNAL) + if (id == CLOCK_SOURCE_ID_EXTERNAL) return false; if(!is_same_timing( diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c index 10cc727..d944781 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c @@ -1250,7 +1250,8 @@ static void switch_dp_clock_sources( find_used_clk_src_for_sharing( val_context, stream); - if (clk_src != stream->clock_source) { + if (clk_src && + clk_src != stream->clock_source) { unreference_clock_source( &val_context->res_ctx, stream->clock_source); -- 1.9.1