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
332
333
|
From dcbe7602dfadb1c98263549d942211d8878105eb Mon Sep 17 00:00:00 2001
From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Fri, 24 Feb 2017 14:19:40 -0500
Subject: [PATCH 0239/4131] drm/amd/display: remove apply_clk_constraints, used
validate_bandwidth universally
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 50 ++++++++++++++--------
.../drm/amd/display/dc/dce100/dce100_resource.c | 10 +++--
.../drm/amd/display/dc/dce110/dce110_resource.c | 18 ++++----
.../drm/amd/display/dc/dce112/dce112_resource.c | 18 ++++----
.../drm/amd/display/dc/dce112/dce112_resource.h | 2 +-
.../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +-
drivers/gpu/drm/amd/display/dc/inc/core_status.h | 1 -
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 +--
8 files changed, 59 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index e0d9572..da0f720 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1144,12 +1144,11 @@ bool dc_pre_update_surfaces_to_stream(
}
}
- if (core_dc->res_pool->funcs->validate_bandwidth)
- if (core_dc->res_pool->funcs->validate_bandwidth(core_dc, context) != DC_OK) {
- BREAK_TO_DEBUGGER();
- ret = false;
- goto unexpected_fail;
- }
+ if (!core_dc->res_pool->funcs->validate_bandwidth(core_dc, context)) {
+ BREAK_TO_DEBUGGER();
+ ret = false;
+ goto unexpected_fail;
+ }
if (!IS_FPGA_MAXIMUS_DC(core_dc->ctx->dce_environment)
&& prev_disp_clk < context->dispclk_khz) {
@@ -1184,28 +1183,36 @@ bool dc_pre_update_surfaces_to_stream(
bool dc_post_update_surfaces_to_stream(struct dc *dc)
{
- struct core_dc *core_dc = DC_TO_CORE(dc);
int i;
+ struct core_dc *core_dc = DC_TO_CORE(dc);
+ struct validate_context *context = dm_alloc(sizeof(struct validate_context));
+
+ if (!context) {
+ dm_error("%s: failed to create validate ctx\n", __func__);
+ return false;
+ }
+ resource_validate_ctx_copy_construct(core_dc->current_context, context);
post_surface_trace(dc);
- for (i = 0; i < core_dc->current_context->res_ctx.pool->pipe_count; i++)
- if (core_dc->current_context->res_ctx.pipe_ctx[i].stream == NULL) {
- core_dc->current_context->res_ctx.pipe_ctx[i].pipe_idx = i;
+ for (i = 0; i < context->res_ctx.pool->pipe_count; i++)
+ if (context->res_ctx.pipe_ctx[i].stream == NULL) {
+ context->res_ctx.pipe_ctx[i].pipe_idx = i;
core_dc->hwss.power_down_front_end(
- core_dc, &core_dc->current_context->res_ctx.pipe_ctx[i]);
- }
- if (core_dc->res_pool->funcs->validate_bandwidth)
- if (core_dc->res_pool->funcs->validate_bandwidth(
- core_dc, core_dc->current_context) != DC_OK) {
- BREAK_TO_DEBUGGER();
- return false;
+ core_dc, &context->res_ctx.pipe_ctx[i]);
}
+ if (!core_dc->res_pool->funcs->validate_bandwidth(core_dc, context)) {
+ BREAK_TO_DEBUGGER();
+ return false;
+ }
core_dc->hwss.set_bandwidth(core_dc);
- pplib_apply_display_requirements(
- core_dc, core_dc->current_context, &core_dc->current_context->pp_display_cfg);
+ /*TODO: dce specific*/
+ pplib_apply_display_requirements(core_dc, context, &context->pp_display_cfg);
+
+ resource_validate_ctx_destruct(core_dc->current_context);
+ core_dc->current_context = context;
return true;
}
@@ -1472,6 +1479,11 @@ void dc_update_surfaces_for_stream(struct dc *dc,
*(updates[i].hdr_static_metadata);
}
+ if (update_type == UPDATE_TYPE_FULL &&
+ !core_dc->res_pool->funcs->validate_bandwidth(core_dc, context)) {
+ BREAK_TO_DEBUGGER();
+ return;
+ }
if (!surface_count) /* reset */
core_dc->hwss.apply_ctx_for_surface(core_dc, NULL, context);
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 9ed7c06..fc85efa 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -765,14 +765,14 @@ static enum dc_status validate_mapped_resource(
return DC_OK;
}
-enum dc_status dce100_validate_bandwidth(
+bool dce100_validate_bandwidth(
const struct core_dc *dc,
struct validate_context *context)
{
/* TODO implement when needed but for now hardcode max value*/
context->dispclk_khz = 681000;
- return DC_OK;
+ return false;
}
static bool dce100_validate_surface_sets(
@@ -840,7 +840,8 @@ enum dc_status dce100_validate_with_context(
result = resource_build_scaling_params_for_context(dc, context);
if (result == DC_OK)
- result = dce100_validate_bandwidth(dc, context);
+ if (!dce100_validate_bandwidth(dc, context))
+ result = DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
@@ -873,7 +874,8 @@ enum dc_status dce100_validate_guaranteed(
}
if (result == DC_OK)
- result = dce100_validate_bandwidth(dc, context);
+ if (!dce100_validate_bandwidth(dc, context))
+ result = DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index 80b2359..b9d0b5e 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -912,30 +912,28 @@ static enum dc_status validate_mapped_resource(
return DC_OK;
}
-enum dc_status dce110_validate_bandwidth(
+bool dce110_validate_bandwidth(
const struct core_dc *dc,
struct validate_context *context)
{
- enum dc_status result = DC_ERROR_UNEXPECTED;
+ bool result = false;
dm_logger_write(
dc->ctx->logger, LOG_BANDWIDTH_CALCS,
"%s: start",
__func__);
- if (!bw_calcs(
+ if (bw_calcs(
dc->ctx,
&dc->bw_dceip,
&dc->bw_vbios,
context->res_ctx.pipe_ctx,
context->res_ctx.pool->pipe_count,
&context->bw_results))
- result = DC_FAIL_BANDWIDTH_VALIDATE;
- else
- result = DC_OK;
+ result = true;
context->dispclk_khz = context->bw_results.dispclk_khz;
- if (result == DC_FAIL_BANDWIDTH_VALIDATE)
+ if (!result)
dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_VALIDATION,
"%s: %dx%d@%d Bandwidth validation failed!\n",
__func__,
@@ -1073,7 +1071,8 @@ enum dc_status dce110_validate_with_context(
result = resource_build_scaling_params_for_context(dc, context);
if (result == DC_OK)
- result = dce110_validate_bandwidth(dc, context);
+ if (!dce110_validate_bandwidth(dc, context))
+ result = DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
@@ -1106,7 +1105,8 @@ enum dc_status dce110_validate_guaranteed(
}
if (result == DC_OK)
- result = dce110_validate_bandwidth(dc, context);
+ if (!dce110_validate_bandwidth(dc, context))
+ result = DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index ce6c69f..32aa1b5 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -836,30 +836,28 @@ static enum dc_status validate_mapped_resource(
return DC_OK;
}
-enum dc_status dce112_validate_bandwidth(
+bool dce112_validate_bandwidth(
const struct core_dc *dc,
struct validate_context *context)
{
- enum dc_status result = DC_ERROR_UNEXPECTED;
+ bool result = false;
dm_logger_write(
dc->ctx->logger, LOG_BANDWIDTH_CALCS,
"%s: start",
__func__);
- if (!bw_calcs(
+ if (bw_calcs(
dc->ctx,
&dc->bw_dceip,
&dc->bw_vbios,
context->res_ctx.pipe_ctx,
context->res_ctx.pool->pipe_count,
&context->bw_results))
- result = DC_FAIL_BANDWIDTH_VALIDATE;
- else
- result = DC_OK;
+ result = true;
context->dispclk_khz = context->bw_results.dispclk_khz;
- if (result == DC_FAIL_BANDWIDTH_VALIDATE)
+ if (!result)
dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_VALIDATION,
"%s: Bandwidth validation failed!",
__func__);
@@ -1026,7 +1024,8 @@ enum dc_status dce112_validate_with_context(
result = resource_build_scaling_params_for_context(dc, context);
if (result == DC_OK)
- result = dce112_validate_bandwidth(dc, context);
+ if (!dce112_validate_bandwidth(dc, context))
+ result = DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
@@ -1059,7 +1058,8 @@ enum dc_status dce112_validate_guaranteed(
}
if (result == DC_OK)
- result = dce112_validate_bandwidth(dc, context);
+ if (!dce112_validate_bandwidth(dc, context))
+ result = DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.h b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.h
index faa8c45..dc842aa 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.h
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.h
@@ -46,7 +46,7 @@ enum dc_status dce112_validate_guaranteed(
const struct dc_stream *dc_stream,
struct validate_context *context);
-enum dc_status dce112_validate_bandwidth(
+bool dce112_validate_bandwidth(
const struct core_dc *dc,
struct validate_context *context);
diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
index fbbdd0e..a3e8182 100644
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
@@ -780,7 +780,7 @@ static enum dc_status validate_mapped_resource(
return DC_OK;
}
-enum dc_status dce80_validate_bandwidth(
+bool dce80_validate_bandwidth(
const struct core_dc *dc,
struct validate_context *context)
{
@@ -788,7 +788,7 @@ enum dc_status dce80_validate_bandwidth(
context->dispclk_khz = 681000;
context->bw_results.required_yclk = 250000 * MEMORY_TYPE_MULTIPLIER;
- return DC_OK;
+ return true;
}
static bool dce80_validate_surface_sets(
diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_status.h b/drivers/gpu/drm/amd/display/dc/inc/core_status.h
index 23d52ae..128617d 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_status.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_status.h
@@ -41,7 +41,6 @@ enum dc_status {
DC_SURFACE_PIXEL_FORMAT_UNSUPPORTED = 11,
DC_FAIL_BANDWIDTH_VALIDATE = 12, /* BW and Watermark validation */
DC_FAIL_SCALING = 13,
- DC_FAIL_CLK_CONSTRAINT = 14,
DC_ERROR_UNEXPECTED = -1
};
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 124df67..e8fe333 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -207,11 +207,7 @@ struct resource_funcs {
const struct dc_stream *stream,
struct validate_context *context);
- enum dc_status (*validate_bandwidth)(
- const struct core_dc *dc,
- struct validate_context *context);
-
- struct validate_context *(*apply_clk_constraints)(
+ bool (*validate_bandwidth)(
const struct core_dc *dc,
struct validate_context *context);
--
2.7.4
|
