Skip to content

Commit 803c270

Browse files
Yang Lialexdeucher
authored andcommitted
drm/amd/display: clean up some inconsistent indentings
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn35/dcn35_fpu.c:261 dcn35_update_bw_bounding_box_fpu() warn: inconsistent indenting Signed-off-by: Yang Li <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 08e9ebc commit 803c270

File tree

1 file changed

+72
-72
lines changed

1 file changed

+72
-72
lines changed

drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -236,85 +236,85 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc,
236236

237237
dc_assert_fp_enabled();
238238

239-
dcn3_5_ip.max_num_otg =
240-
dc->res_pool->res_cap->num_timing_generator;
241-
dcn3_5_ip.max_num_dpp = dc->res_pool->pipe_count;
242-
dcn3_5_soc.num_chans = bw_params->num_channels;
243-
244-
ASSERT(clk_table->num_entries);
245-
246-
/* Prepass to find max clocks independent of voltage level. */
247-
for (i = 0; i < clk_table->num_entries; ++i) {
248-
if (clk_table->entries[i].dispclk_mhz > max_dispclk_mhz)
249-
max_dispclk_mhz = clk_table->entries[i].dispclk_mhz;
250-
if (clk_table->entries[i].dppclk_mhz > max_dppclk_mhz)
251-
max_dppclk_mhz = clk_table->entries[i].dppclk_mhz;
252-
}
239+
dcn3_5_ip.max_num_otg =
240+
dc->res_pool->res_cap->num_timing_generator;
241+
dcn3_5_ip.max_num_dpp = dc->res_pool->pipe_count;
242+
dcn3_5_soc.num_chans = bw_params->num_channels;
243+
244+
ASSERT(clk_table->num_entries);
245+
246+
/* Prepass to find max clocks independent of voltage level. */
247+
for (i = 0; i < clk_table->num_entries; ++i) {
248+
if (clk_table->entries[i].dispclk_mhz > max_dispclk_mhz)
249+
max_dispclk_mhz = clk_table->entries[i].dispclk_mhz;
250+
if (clk_table->entries[i].dppclk_mhz > max_dppclk_mhz)
251+
max_dppclk_mhz = clk_table->entries[i].dppclk_mhz;
252+
}
253253

254-
for (i = 0; i < clk_table->num_entries; i++) {
255-
/* loop backwards*/
256-
for (closest_clk_lvl = 0, j = dcn3_5_soc.num_states - 1;
257-
j >= 0; j--) {
258-
if (dcn3_5_soc.clock_limits[j].dcfclk_mhz <=
259-
clk_table->entries[i].dcfclk_mhz) {
260-
closest_clk_lvl = j;
261-
break;
262-
}
263-
}
264-
if (clk_table->num_entries == 1) {
265-
/*smu gives one DPM level, let's take the highest one*/
266-
closest_clk_lvl = dcn3_5_soc.num_states - 1;
254+
for (i = 0; i < clk_table->num_entries; i++) {
255+
/* loop backwards*/
256+
for (closest_clk_lvl = 0, j = dcn3_5_soc.num_states - 1;
257+
j >= 0; j--) {
258+
if (dcn3_5_soc.clock_limits[j].dcfclk_mhz <=
259+
clk_table->entries[i].dcfclk_mhz) {
260+
closest_clk_lvl = j;
261+
break;
267262
}
263+
}
264+
if (clk_table->num_entries == 1) {
265+
/*smu gives one DPM level, let's take the highest one*/
266+
closest_clk_lvl = dcn3_5_soc.num_states - 1;
267+
}
268268

269-
clock_limits[i].state = i;
270-
271-
/* Clocks dependent on voltage level. */
272-
clock_limits[i].dcfclk_mhz = clk_table->entries[i].dcfclk_mhz;
273-
if (clk_table->num_entries == 1 &&
274-
clock_limits[i].dcfclk_mhz <
275-
dcn3_5_soc.clock_limits[closest_clk_lvl].dcfclk_mhz) {
276-
/*SMU fix not released yet*/
277-
clock_limits[i].dcfclk_mhz =
278-
dcn3_5_soc.clock_limits[closest_clk_lvl].dcfclk_mhz;
279-
}
269+
clock_limits[i].state = i;
280270

281-
clock_limits[i].fabricclk_mhz =
282-
clk_table->entries[i].fclk_mhz;
283-
clock_limits[i].socclk_mhz =
284-
clk_table->entries[i].socclk_mhz;
285-
286-
if (clk_table->entries[i].memclk_mhz &&
287-
clk_table->entries[i].wck_ratio)
288-
clock_limits[i].dram_speed_mts =
289-
clk_table->entries[i].memclk_mhz * 2 *
290-
clk_table->entries[i].wck_ratio;
291-
292-
/* Clocks independent of voltage level. */
293-
clock_limits[i].dispclk_mhz = max_dispclk_mhz ?
294-
max_dispclk_mhz :
295-
dcn3_5_soc.clock_limits[closest_clk_lvl].dispclk_mhz;
296-
297-
clock_limits[i].dppclk_mhz = max_dppclk_mhz ?
298-
max_dppclk_mhz :
299-
dcn3_5_soc.clock_limits[closest_clk_lvl].dppclk_mhz;
300-
301-
clock_limits[i].dram_bw_per_chan_gbps =
302-
dcn3_5_soc.clock_limits[closest_clk_lvl].dram_bw_per_chan_gbps;
303-
clock_limits[i].dscclk_mhz =
304-
dcn3_5_soc.clock_limits[closest_clk_lvl].dscclk_mhz;
305-
clock_limits[i].dtbclk_mhz =
306-
dcn3_5_soc.clock_limits[closest_clk_lvl].dtbclk_mhz;
307-
clock_limits[i].phyclk_d18_mhz =
308-
dcn3_5_soc.clock_limits[closest_clk_lvl].phyclk_d18_mhz;
309-
clock_limits[i].phyclk_mhz =
310-
dcn3_5_soc.clock_limits[closest_clk_lvl].phyclk_mhz;
271+
/* Clocks dependent on voltage level. */
272+
clock_limits[i].dcfclk_mhz = clk_table->entries[i].dcfclk_mhz;
273+
if (clk_table->num_entries == 1 &&
274+
clock_limits[i].dcfclk_mhz <
275+
dcn3_5_soc.clock_limits[closest_clk_lvl].dcfclk_mhz) {
276+
/*SMU fix not released yet*/
277+
clock_limits[i].dcfclk_mhz =
278+
dcn3_5_soc.clock_limits[closest_clk_lvl].dcfclk_mhz;
311279
}
312280

313-
memcpy(dcn3_5_soc.clock_limits, clock_limits,
314-
sizeof(dcn3_5_soc.clock_limits));
281+
clock_limits[i].fabricclk_mhz =
282+
clk_table->entries[i].fclk_mhz;
283+
clock_limits[i].socclk_mhz =
284+
clk_table->entries[i].socclk_mhz;
285+
286+
if (clk_table->entries[i].memclk_mhz &&
287+
clk_table->entries[i].wck_ratio)
288+
clock_limits[i].dram_speed_mts =
289+
clk_table->entries[i].memclk_mhz * 2 *
290+
clk_table->entries[i].wck_ratio;
291+
292+
/* Clocks independent of voltage level. */
293+
clock_limits[i].dispclk_mhz = max_dispclk_mhz ?
294+
max_dispclk_mhz :
295+
dcn3_5_soc.clock_limits[closest_clk_lvl].dispclk_mhz;
296+
297+
clock_limits[i].dppclk_mhz = max_dppclk_mhz ?
298+
max_dppclk_mhz :
299+
dcn3_5_soc.clock_limits[closest_clk_lvl].dppclk_mhz;
300+
301+
clock_limits[i].dram_bw_per_chan_gbps =
302+
dcn3_5_soc.clock_limits[closest_clk_lvl].dram_bw_per_chan_gbps;
303+
clock_limits[i].dscclk_mhz =
304+
dcn3_5_soc.clock_limits[closest_clk_lvl].dscclk_mhz;
305+
clock_limits[i].dtbclk_mhz =
306+
dcn3_5_soc.clock_limits[closest_clk_lvl].dtbclk_mhz;
307+
clock_limits[i].phyclk_d18_mhz =
308+
dcn3_5_soc.clock_limits[closest_clk_lvl].phyclk_d18_mhz;
309+
clock_limits[i].phyclk_mhz =
310+
dcn3_5_soc.clock_limits[closest_clk_lvl].phyclk_mhz;
311+
}
312+
313+
memcpy(dcn3_5_soc.clock_limits, clock_limits,
314+
sizeof(dcn3_5_soc.clock_limits));
315315

316-
if (clk_table->num_entries)
317-
dcn3_5_soc.num_states = clk_table->num_entries;
316+
if (clk_table->num_entries)
317+
dcn3_5_soc.num_states = clk_table->num_entries;
318318

319319
if (max_dispclk_mhz) {
320320
dcn3_5_soc.dispclk_dppclk_vco_speed_mhz = max_dispclk_mhz * 2;

0 commit comments

Comments
 (0)