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
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
|
From 6ad54a5d488d51b47d0e2da56a60c81d80683e9d Mon Sep 17 00:00:00 2001
From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Wed, 30 Nov 2016 15:45:51 -0500
Subject: [PATCH 0038/4131] drm/amd/display: remove get_min_clocks_state
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@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_link.c | 10 +----
.../display/dc/gpu/dce110/display_clock_dce110.c | 42 +++++++++++---------
.../display/dc/gpu/dce112/display_clock_dce112.c | 45 ++++++++++++----------
.../display/dc/gpu/dce112/display_clock_dce112.h | 2 +-
.../amd/display/dc/gpu/dce80/display_clock_dce80.c | 30 ++++++++-------
.../amd/display/include/display_clock_interface.h | 2 -
6 files changed, 67 insertions(+), 64 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 ab4efde..558eeef 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -1208,7 +1208,6 @@ static enum dc_status enable_link_dp(struct pipe_ctx *pipe_ctx)
struct core_link *link = stream->sink->link;
struct dc_link_settings link_settings = {0};
enum dp_panel_mode panel_mode;
- enum clocks_state cur_min_clock_state;
enum dc_link_rate max_link_rate = LINK_RATE_HIGH2;
/* get link settings for video mode timing */
@@ -1221,13 +1220,8 @@ static enum dc_status enable_link_dp(struct pipe_ctx *pipe_ctx)
max_link_rate = LINK_RATE_HIGH3;
if (link_settings.link_rate == max_link_rate) {
- cur_min_clock_state = CLOCKS_STATE_INVALID;
-
- if (pipe_ctx->dis_clk->funcs->get_min_clocks_state) {
- cur_min_clock_state =
- pipe_ctx->dis_clk->funcs->get_min_clocks_state(
- pipe_ctx->dis_clk);
- if (cur_min_clock_state < CLOCKS_STATE_NOMINAL)
+ if (pipe_ctx->dis_clk->funcs->set_min_clocks_state) {
+ if (pipe_ctx->dis_clk->cur_min_clks_state < CLOCKS_STATE_NOMINAL)
pipe_ctx->dis_clk->funcs->set_min_clocks_state(
pipe_ctx->dis_clk, CLOCKS_STATE_NOMINAL);
} else {
diff --git a/drivers/gpu/drm/amd/display/dc/gpu/dce110/display_clock_dce110.c b/drivers/gpu/drm/amd/display/dc/gpu/dce110/display_clock_dce110.c
index ad7ebc1..8386020 100644
--- a/drivers/gpu/drm/amd/display/dc/gpu/dce110/display_clock_dce110.c
+++ b/drivers/gpu/drm/amd/display/dc/gpu/dce110/display_clock_dce110.c
@@ -103,25 +103,19 @@ static struct divider_range divider_ranges[DIVIDER_RANGE_MAX];
* static functions
*****************************************************************************/
-static enum clocks_state get_min_clocks_state(struct display_clock *base)
-{
- return base->cur_min_clks_state;
-}
-
-static bool set_min_clocks_state(
- struct display_clock *base,
+static bool dce110_set_min_clocks_state(
+ struct display_clock *dc,
enum clocks_state clocks_state)
{
- struct display_clock_dce110 *dc = DCLCK110_FROM_BASE(base);
struct dm_pp_power_level_change_request level_change_req = {
DM_PP_POWER_LEVEL_INVALID};
- if (clocks_state > base->max_clks_state) {
+ if (clocks_state > dc->max_clks_state) {
/*Requested state exceeds max supported state.*/
- dm_logger_write(base->ctx->logger, LOG_WARNING,
+ dm_logger_write(dc->ctx->logger, LOG_WARNING,
"Requested state exceeds max supported state");
return false;
- } else if (clocks_state == base->cur_min_clks_state) {
+ } else if (clocks_state == dc->cur_min_clks_state) {
/*if we're trying to set the same state, we can just return
* since nothing needs to be done*/
return true;
@@ -140,17 +134,28 @@ static bool set_min_clocks_state(
case CLOCKS_STATE_PERFORMANCE:
level_change_req.power_level = DM_PP_POWER_LEVEL_PERFORMANCE;
break;
+ case CLOCKS_DPM_STATE_LEVEL_4:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_4;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_5:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_5;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_6:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_6;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_7:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_7;
+ break;
case CLOCKS_STATE_INVALID:
default:
- dm_logger_write(base->ctx->logger, LOG_WARNING,
+ dm_logger_write(dc->ctx->logger, LOG_WARNING,
"Requested state invalid state");
return false;
}
/* get max clock state from PPLIB */
- if (dm_pp_apply_power_level_change_request(
- base->ctx, &level_change_req))
- base->cur_min_clks_state = clocks_state;
+ if (dm_pp_apply_power_level_change_request(dc->ctx, &level_change_req))
+ dc->cur_min_clks_state = clocks_state;
return true;
}
@@ -384,7 +389,7 @@ static void psr_wait_loop(struct dc_context *ctx, unsigned int display_clk_khz)
dm_write_reg(ctx, mmMASTER_COMM_CNTL_REG, masterComCntl);
}
-static void set_clock(
+static void dce110_set_clock(
struct display_clock *base,
uint32_t requested_clk_khz)
{
@@ -424,10 +429,9 @@ static void set_clock(
static const struct display_clock_funcs funcs = {
.destroy = destroy,
.get_dp_ref_clk_frequency = get_dp_ref_clk_frequency,
- .get_min_clocks_state = get_min_clocks_state,
.get_required_clocks_state = get_required_clocks_state,
- .set_clock = set_clock,
- .set_min_clocks_state = set_min_clocks_state
+ .set_clock = dce110_set_clock,
+ .set_min_clocks_state = dce110_set_min_clocks_state
};
static bool dal_display_clock_dce110_construct(
diff --git a/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.c b/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.c
index d8c8d8a..4488497 100644
--- a/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.c
+++ b/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.c
@@ -73,26 +73,19 @@ static struct divider_range divider_ranges[DIVIDER_RANGE_MAX];
#define dce112_DFS_BYPASS_THRESHOLD_KHZ 400000
-enum clocks_state dispclk_dce112_get_min_clocks_state(
- struct display_clock *base)
-{
- return base->cur_min_clks_state;
-}
-
-bool dispclk_dce112_set_min_clocks_state(
- struct display_clock *base,
+static bool dce112_set_min_clocks_state(
+ struct display_clock *dc,
enum clocks_state clocks_state)
{
- struct display_clock_dce112 *dc = DCLCK112_FROM_BASE(base);
struct dm_pp_power_level_change_request level_change_req = {
- DM_PP_POWER_LEVEL_INVALID};
+ DM_PP_POWER_LEVEL_INVALID };
- if (clocks_state > base->max_clks_state) {
+ if (clocks_state > dc->max_clks_state) {
/*Requested state exceeds max supported state.*/
- dm_logger_write(base->ctx->logger, LOG_WARNING,
+ dm_logger_write(dc->ctx->logger, LOG_WARNING,
"Requested state exceeds max supported state");
return false;
- } else if (clocks_state == base->cur_min_clks_state) {
+ } else if (clocks_state == dc->cur_min_clks_state) {
/*if we're trying to set the same state, we can just return
* since nothing needs to be done*/
return true;
@@ -111,17 +104,28 @@ bool dispclk_dce112_set_min_clocks_state(
case CLOCKS_STATE_PERFORMANCE:
level_change_req.power_level = DM_PP_POWER_LEVEL_PERFORMANCE;
break;
+ case CLOCKS_DPM_STATE_LEVEL_4:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_4;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_5:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_5;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_6:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_6;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_7:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_7;
+ break;
case CLOCKS_STATE_INVALID:
default:
- dm_logger_write(base->ctx->logger, LOG_WARNING,
+ dm_logger_write(dc->ctx->logger, LOG_WARNING,
"Requested state invalid state");
return false;
}
/* get max clock state from PPLIB */
- if (dm_pp_apply_power_level_change_request(
- base->ctx, &level_change_req))
- base->cur_min_clks_state = clocks_state;
+ if (dm_pp_apply_power_level_change_request(dc->ctx, &level_change_req))
+ dc->cur_min_clks_state = clocks_state;
return true;
}
@@ -293,7 +297,7 @@ enum clocks_state dispclk_dce112_get_required_clocks_state(
return low_req_clk;
}
-void dispclk_dce112_set_clock(
+void dce112_set_clock(
struct display_clock *base,
uint32_t requested_clk_khz)
{
@@ -333,10 +337,9 @@ void dispclk_dce112_set_clock(
static const struct display_clock_funcs funcs = {
.destroy = dispclk_dce112_destroy,
.get_dp_ref_clk_frequency = get_dp_ref_clk_frequency,
- .get_min_clocks_state = dispclk_dce112_get_min_clocks_state,
.get_required_clocks_state = dispclk_dce112_get_required_clocks_state,
- .set_clock = dispclk_dce112_set_clock,
- .set_min_clocks_state = dispclk_dce112_set_min_clocks_state
+ .set_clock = dce112_set_clock,
+ .set_min_clocks_state = dce112_set_min_clocks_state
};
bool dal_display_clock_dce112_construct(
diff --git a/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.h b/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.h
index 398af34..0246f93 100644
--- a/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.h
+++ b/drivers/gpu/drm/amd/display/dc/gpu/dce112/display_clock_dce112.h
@@ -78,7 +78,7 @@ enum clocks_state dispclk_dce112_get_required_clocks_state(
struct display_clock *dc,
struct state_dependent_clocks *req_clocks);
-void dispclk_dce112_set_clock(
+void dce112_set_clock(
struct display_clock *base,
uint32_t requested_clk_khz);
diff --git a/drivers/gpu/drm/amd/display/dc/gpu/dce80/display_clock_dce80.c b/drivers/gpu/drm/amd/display/dc/gpu/dce80/display_clock_dce80.c
index b101f7d..60570427 100644
--- a/drivers/gpu/drm/amd/display/dc/gpu/dce80/display_clock_dce80.c
+++ b/drivers/gpu/drm/amd/display/dc/gpu/dce80/display_clock_dce80.c
@@ -90,7 +90,7 @@ static struct divider_range divider_ranges[DIVIDER_RANGE_MAX];
#define FROM_DISPLAY_CLOCK(base) \
container_of(base, struct display_clock_dce80, disp_clk)
-static void set_clock(
+static void dce80_set_clock(
struct display_clock *dc,
uint32_t requested_clk_khz)
{
@@ -111,13 +111,6 @@ static void set_clock(
dc->cur_min_clks_state = CLOCKS_STATE_NOMINAL;
}
-static enum clocks_state get_min_clocks_state(struct display_clock *dc)
-{
- struct display_clock_dce80 *disp_clk = FROM_DISPLAY_CLOCK(dc);
-
- return disp_clk->cur_min_clks_state;
-}
-
static enum clocks_state get_required_clocks_state
(struct display_clock *dc,
struct state_dependent_clocks *req_clocks)
@@ -145,12 +138,12 @@ static enum clocks_state get_required_clocks_state
return low_req_clk;
}
-static bool set_min_clocks_state(
+static bool dce80_set_min_clocks_state(
struct display_clock *dc,
enum clocks_state clocks_state)
{
struct dm_pp_power_level_change_request level_change_req = {
- DM_PP_POWER_LEVEL_INVALID};
+ DM_PP_POWER_LEVEL_INVALID };
if (clocks_state > dc->max_clks_state) {
/*Requested state exceeds max supported state.*/
@@ -176,6 +169,18 @@ static bool set_min_clocks_state(
case CLOCKS_STATE_PERFORMANCE:
level_change_req.power_level = DM_PP_POWER_LEVEL_PERFORMANCE;
break;
+ case CLOCKS_DPM_STATE_LEVEL_4:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_4;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_5:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_5;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_6:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_6;
+ break;
+ case CLOCKS_DPM_STATE_LEVEL_7:
+ level_change_req.power_level = DM_PP_POWER_LEVEL_7;
+ break;
case CLOCKS_STATE_INVALID:
default:
dm_logger_write(dc->ctx->logger, LOG_WARNING,
@@ -375,10 +380,9 @@ static void destroy(struct display_clock **dc)
static const struct display_clock_funcs funcs = {
.destroy = destroy,
.get_dp_ref_clk_frequency = get_dp_ref_clk_frequency,
- .get_min_clocks_state = get_min_clocks_state,
.get_required_clocks_state = get_required_clocks_state,
- .set_clock = set_clock,
- .set_min_clocks_state = set_min_clocks_state
+ .set_clock = dce80_set_clock,
+ .set_min_clocks_state = dce80_set_min_clocks_state
};
diff --git a/drivers/gpu/drm/amd/display/include/display_clock_interface.h b/drivers/gpu/drm/amd/display/include/display_clock_interface.h
index bc678a5..f2deafb 100644
--- a/drivers/gpu/drm/amd/display/include/display_clock_interface.h
+++ b/drivers/gpu/drm/amd/display/include/display_clock_interface.h
@@ -70,8 +70,6 @@ struct display_clock_funcs {
void (*destroy)(struct display_clock **to_destroy);
void (*set_clock)(struct display_clock *disp_clk,
uint32_t requested_clock_khz);
- enum clocks_state (*get_min_clocks_state)(
- struct display_clock *disp_clk);
enum clocks_state (*get_required_clocks_state)(
struct display_clock *disp_clk,
struct state_dependent_clocks *req_clocks);
--
2.7.4
|
