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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
From 5c3d75f6ed3c9670a41c9e1f73925849b705a66c Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Tue, 5 Sep 2017 15:50:48 -0400
Subject: [PATCH 2373/4131] drm/amd/display: No need to keep track of unreffed
clk sources
This simplifies clock source reprogramming a bit.
Signed-off-by: Harry Wentland <harry.wentland@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>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 18 ++--------------
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 21 +++++-------------
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 25 +++++++---------------
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 --
drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 +-
5 files changed, 16 insertions(+), 52 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index b17e1f6..d470657 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -261,13 +261,12 @@ bool resource_construct(
}
-bool resource_unreference_clock_source(
+void resource_unreference_clock_source(
struct resource_context *res_ctx,
const struct resource_pool *pool,
struct clock_source *clock_source)
{
int i;
- bool need_reset = false;
for (i = 0; i < pool->clk_src_count; i++) {
if (pool->clock_sources[i] != clock_source)
@@ -275,24 +274,11 @@ bool resource_unreference_clock_source(
res_ctx->clock_source_ref_count[i]--;
- if (res_ctx->clock_source_ref_count[i] == 0) {
- res_ctx->clock_source_changed[i] = true;
- need_reset = true;
- }
-
break;
}
- if (pool->dp_clock_source == clock_source) {
+ if (pool->dp_clock_source == clock_source)
res_ctx->dp_clock_source_ref_count--;
-
- if (res_ctx->dp_clock_source_ref_count == 0) {
- res_ctx->dp_clock_source_changed = true;
- need_reset = true;
- }
- }
-
- return need_reset;
}
void resource_reference_clock_source(
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 888e6e6..838d680 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
@@ -1635,6 +1635,8 @@ static void dce110_reset_hw_ctx_wrap(
if (!pipe_ctx->stream ||
pipe_need_reprogram(pipe_ctx_old, pipe_ctx)) {
+ struct clock_source *old_clk = pipe_ctx_old->clock_source;
+
core_link_disable_stream(pipe_ctx_old);
pipe_ctx_old->stream_res.tg->funcs->set_blank(pipe_ctx_old->stream_res.tg, true);
if (!hwss_wait_for_blank_complete(pipe_ctx_old->stream_res.tg)) {
@@ -1645,27 +1647,14 @@ static void dce110_reset_hw_ctx_wrap(
pipe_ctx_old->plane_res.mi->funcs->free_mem_input(
pipe_ctx_old->plane_res.mi, dc->current_state->stream_count);
+ if (old_clk)
+ old_clk->funcs->cs_power_down(old_clk);
+
dc->hwss.power_down_front_end(dc, pipe_ctx_old->pipe_idx);
pipe_ctx_old->stream = NULL;
}
}
-
- /* power down changed clock sources */
- for (i = 0; i < dc->res_pool->clk_src_count; i++)
- if (context->res_ctx.clock_source_changed[i]) {
- struct clock_source *clk = dc->res_pool->clock_sources[i];
-
- clk->funcs->cs_power_down(clk);
- context->res_ctx.clock_source_changed[i] = false;
- }
-
- if (context->res_ctx.dp_clock_source_changed) {
- struct clock_source *clk = dc->res_pool->dp_clock_source;
-
- clk->funcs->cs_power_down(clk);
- context->res_ctx.clock_source_changed[i] = false;
- }
}
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 6fee695..c8c4b95 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -1265,22 +1265,6 @@ static void reset_hw_ctx_wrap(
plane_atomic_power_down(dc, i);
}
- /* power down changed clock sources */
- for (i = 0; i < dc->res_pool->clk_src_count; i++)
- if (context->res_ctx.clock_source_changed[i]) {
- struct clock_source *clk = dc->res_pool->clock_sources[i];
-
- clk->funcs->cs_power_down(clk);
- context->res_ctx.clock_source_changed[i] = false;
- }
-
- if (context->res_ctx.dp_clock_source_changed) {
- struct clock_source *clk = dc->res_pool->dp_clock_source;
-
- clk->funcs->cs_power_down(clk);
- context->res_ctx.dp_clock_source_changed = false;
- }
-
/* Reset Back End*/
for (i = dc->res_pool->pipe_count - 1; i >= 0 ; i--) {
struct pipe_ctx *pipe_ctx_old =
@@ -1291,9 +1275,16 @@ static void reset_hw_ctx_wrap(
continue;
if (!pipe_ctx->stream ||
- pipe_need_reprogram(pipe_ctx_old, pipe_ctx))
+ pipe_need_reprogram(pipe_ctx_old, pipe_ctx)) {
+ struct clock_source *old_clk = pipe_ctx_old->clock_source;
+
reset_back_end_for_pipe(dc, pipe_ctx_old, dc->current_state);
+
+ if (old_clk)
+ old_clk->funcs->cs_power_down(old_clk);
+ }
}
+
}
static bool patch_address_for_sbs_tb_stereo(
diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index b6a513d..915d5c1 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -213,9 +213,7 @@ struct resource_context {
bool is_stream_enc_acquired[MAX_PIPES * 2];
bool is_audio_acquired[MAX_PIPES];
uint8_t clock_source_ref_count[MAX_CLOCK_SOURCES];
- bool clock_source_changed[MAX_CLOCK_SOURCES];
uint8_t dp_clock_source_ref_count;
- bool dp_clock_source_changed;
};
struct dce_bw_output {
diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
index cf1797c..614bb69 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
@@ -92,7 +92,7 @@ enum dc_status resource_build_scaling_params_for_context(
void resource_build_info_frame(struct pipe_ctx *pipe_ctx);
-bool resource_unreference_clock_source(
+void resource_unreference_clock_source(
struct resource_context *res_ctx,
const struct resource_pool *pool,
struct clock_source *clock_source);
--
2.7.4
|
