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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From bacb935feec5cbba74c52ee6bfe0482abceddaac Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Mon, 28 Aug 2017 19:44:38 -0400
Subject: [PATCH 2370/4131] drm/amd/display: Remove switching of clk sources at
end of commit
This should be taken care of in validate now.
All of timing sync is quite broken at the moment anyways. Will submit
another patch set to address that.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@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>
---
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 36 ----------------------
1 file changed, 36 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 6a4f75e..888e6e6 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1339,40 +1339,6 @@ static void set_safe_displaymarks(
}
}
-static void switch_dp_clock_sources(
- const struct dc *dc,
- struct resource_context *res_ctx)
-{
- uint8_t i;
- for (i = 0; i < MAX_PIPES; i++) {
- struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];
-
- if (pipe_ctx->stream == NULL || pipe_ctx->top_pipe)
- continue;
-
- if (dc_is_dp_signal(pipe_ctx->stream->signal)) {
- struct clock_source *clk_src =
- resource_find_used_clk_src_for_sharing(
- res_ctx, pipe_ctx);
-
- if (clk_src &&
- clk_src != pipe_ctx->clock_source) {
- if (resource_unreference_clock_source(res_ctx,
- dc->res_pool, pipe_ctx->clock_source)) {
- pipe_ctx->clock_source->funcs->cs_power_down(pipe_ctx->clock_source);
- pipe_ctx->clock_source = NULL;
- }
-
- pipe_ctx->clock_source = clk_src;
- resource_reference_clock_source(
- res_ctx, dc->res_pool, clk_src);
-
- dce_crtc_switch_to_clk_src(dc->hwseq, clk_src, i);
- }
- }
- }
-}
-
/*******************************************************************************
* Public functions
******************************************************************************/
@@ -1934,8 +1900,6 @@ enum dc_status dce110_apply_ctx_to_hw(
dcb->funcs->set_scratch_critical_state(dcb, false);
- switch_dp_clock_sources(dc, &context->res_ctx);
-
#ifdef ENABLE_FBC
if (dc->fbc_compressor)
enable_fbc(dc, context);
--
2.7.4
|
