blob: 92412781d5ed247ce633af8bf31f0913a90f2c06 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From 316a9a10e0046cd4eafe57f575e4591721c5a897 Mon Sep 17 00:00:00 2001
From: Yongqiang Sun <yongqiang.sun@amd.com>
Date: Thu, 17 Dec 2015 16:13:59 -0500
Subject: [PATCH 0636/1110] drm/amd/dal: Modifed check conditions for switch dp
clock source.
Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Acked-by: Jordan Lazare <Jordan.Lazare@amd.com>
---
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 861d80a..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);
--
2.7.4
|
