Commit 81875979 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Alex Deucher

drm/amd/display: Remove extra pairs of parentheses in dce_calcs.c

The double parentheses are not needed. Removing them fixes multiple
warnings like this when building with clang:

drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:617:42:
  error: equality comparison with extraneous parentheses
    [-Werror,-Wparentheses-equality]
  if ((data->graphics_micro_tile_mode == bw_def_rotated_micro_tiling)) {
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e966a725
...@@ -623,7 +623,7 @@ static void calculate_bandwidth( ...@@ -623,7 +623,7 @@ static void calculate_bandwidth(
} }
else { else {
/*graphics portrait tiling mode*/ /*graphics portrait tiling mode*/
if ((data->graphics_micro_tile_mode == bw_def_rotated_micro_tiling)) { if (data->graphics_micro_tile_mode == bw_def_rotated_micro_tiling) {
data->orthogonal_rotation[i] = 0; data->orthogonal_rotation[i] = 0;
} }
else { else {
...@@ -634,7 +634,7 @@ static void calculate_bandwidth( ...@@ -634,7 +634,7 @@ static void calculate_bandwidth(
else { else {
if ((i < 4)) { if ((i < 4)) {
/*underlay landscape tiling mode is only supported*/ /*underlay landscape tiling mode is only supported*/
if ((data->underlay_micro_tile_mode == bw_def_display_micro_tiling)) { if (data->underlay_micro_tile_mode == bw_def_display_micro_tiling) {
data->orthogonal_rotation[i] = 0; data->orthogonal_rotation[i] = 0;
} }
else { else {
...@@ -643,7 +643,7 @@ static void calculate_bandwidth( ...@@ -643,7 +643,7 @@ static void calculate_bandwidth(
} }
else { else {
/*graphics landscape tiling mode*/ /*graphics landscape tiling mode*/
if ((data->graphics_micro_tile_mode == bw_def_display_micro_tiling)) { if (data->graphics_micro_tile_mode == bw_def_display_micro_tiling) {
data->orthogonal_rotation[i] = 0; data->orthogonal_rotation[i] = 0;
} }
else { else {
...@@ -947,14 +947,14 @@ static void calculate_bandwidth( ...@@ -947,14 +947,14 @@ static void calculate_bandwidth(
} }
for (i = 0; i <= maximum_number_of_surfaces - 1; i++) { for (i = 0; i <= maximum_number_of_surfaces - 1; i++) {
if (data->enable[i]) { if (data->enable[i]) {
if ((data->number_of_displays == 1 && data->number_of_underlay_surfaces == 0)) { if (data->number_of_displays == 1 && data->number_of_underlay_surfaces == 0) {
/*set maximum chunk limit if only one graphic pipe is enabled*/ /*set maximum chunk limit if only one graphic pipe is enabled*/
data->outstanding_chunk_request_limit[i] = bw_int_to_fixed(127); data->outstanding_chunk_request_limit[i] = bw_int_to_fixed(127);
} }
else { else {
data->outstanding_chunk_request_limit[i] = bw_ceil2(bw_div(data->adjusted_data_buffer_size[i], data->pipe_chunk_size_in_bytes[i]), bw_int_to_fixed(1)); data->outstanding_chunk_request_limit[i] = bw_ceil2(bw_div(data->adjusted_data_buffer_size[i], data->pipe_chunk_size_in_bytes[i]), bw_int_to_fixed(1));
/*clamp maximum chunk limit in the graphic display pipe*/ /*clamp maximum chunk limit in the graphic display pipe*/
if ((i >= 4)) { if (i >= 4) {
data->outstanding_chunk_request_limit[i] = bw_max2(bw_int_to_fixed(127), data->outstanding_chunk_request_limit[i]); data->outstanding_chunk_request_limit[i] = bw_max2(bw_int_to_fixed(127), data->outstanding_chunk_request_limit[i]);
} }
} }
...@@ -1337,7 +1337,7 @@ static void calculate_bandwidth( ...@@ -1337,7 +1337,7 @@ static void calculate_bandwidth(
/*if stutter and dram clock state change are gated before cursor then the cursor latency hiding does not limit stutter or dram clock state change*/ /*if stutter and dram clock state change are gated before cursor then the cursor latency hiding does not limit stutter or dram clock state change*/
for (i = 0; i <= maximum_number_of_surfaces - 1; i++) { for (i = 0; i <= maximum_number_of_surfaces - 1; i++) {
if (data->enable[i]) { if (data->enable[i]) {
if ((dceip->graphics_lb_nodownscaling_multi_line_prefetching == 1)) { if (dceip->graphics_lb_nodownscaling_multi_line_prefetching == 1) {
data->maximum_latency_hiding[i] = bw_add(data->minimum_latency_hiding[i], bw_mul(bw_frc_to_fixed(8, 10), data->total_dmifmc_urgent_latency)); data->maximum_latency_hiding[i] = bw_add(data->minimum_latency_hiding[i], bw_mul(bw_frc_to_fixed(8, 10), data->total_dmifmc_urgent_latency));
} }
else { else {
...@@ -1396,7 +1396,7 @@ static void calculate_bandwidth( ...@@ -1396,7 +1396,7 @@ static void calculate_bandwidth(
} }
/*determine the number of displays with margin to switch in the v_active region*/ /*determine the number of displays with margin to switch in the v_active region*/
for (k = 0; k <= maximum_number_of_surfaces - 1; k++) { for (k = 0; k <= maximum_number_of_surfaces - 1; k++) {
if ((data->enable[k] == 1 && data->display_pstate_change_enable[k] == 1)) { if (data->enable[k] == 1 && data->display_pstate_change_enable[k] == 1) {
number_of_displays_enabled_with_margin = number_of_displays_enabled_with_margin + 1; number_of_displays_enabled_with_margin = number_of_displays_enabled_with_margin + 1;
} }
} }
...@@ -1442,7 +1442,7 @@ static void calculate_bandwidth( ...@@ -1442,7 +1442,7 @@ static void calculate_bandwidth(
data->nbp_state_change_enable = bw_def_no; data->nbp_state_change_enable = bw_def_no;
} }
/*dram clock change is possible only in vblank if all displays are aligned and have no margin*/ /*dram clock change is possible only in vblank if all displays are aligned and have no margin*/
if ((number_of_aligned_displays_with_no_margin == number_of_displays_enabled)) { if (number_of_aligned_displays_with_no_margin == number_of_displays_enabled) {
nbp_state_change_enable_blank = bw_def_yes; nbp_state_change_enable_blank = bw_def_yes;
} }
else { else {
...@@ -1470,7 +1470,7 @@ static void calculate_bandwidth( ...@@ -1470,7 +1470,7 @@ static void calculate_bandwidth(
} }
} }
/*compute minimum time to read one chunk from the dmif buffer*/ /*compute minimum time to read one chunk from the dmif buffer*/
if ((number_of_displays_enabled > 2)) { if (number_of_displays_enabled > 2) {
data->chunk_request_delay = 0; data->chunk_request_delay = 0;
} }
else { else {
...@@ -1804,7 +1804,7 @@ static void calculate_bandwidth( ...@@ -1804,7 +1804,7 @@ static void calculate_bandwidth(
data->stutter_exit_watermark[i] = bw_add(bw_sub(vbios->stutter_self_refresh_exit_latency, data->total_dmifmc_urgent_latency), data->urgent_watermark[i]); data->stutter_exit_watermark[i] = bw_add(bw_sub(vbios->stutter_self_refresh_exit_latency, data->total_dmifmc_urgent_latency), data->urgent_watermark[i]);
data->stutter_entry_watermark[i] = bw_add(bw_sub(bw_add(vbios->stutter_self_refresh_exit_latency, vbios->stutter_self_refresh_entry_latency), data->total_dmifmc_urgent_latency), data->urgent_watermark[i]); data->stutter_entry_watermark[i] = bw_add(bw_sub(bw_add(vbios->stutter_self_refresh_exit_latency, vbios->stutter_self_refresh_entry_latency), data->total_dmifmc_urgent_latency), data->urgent_watermark[i]);
/*unconditionally remove black out time from the nb p_state watermark*/ /*unconditionally remove black out time from the nb p_state watermark*/
if ((data->display_pstate_change_enable[i] == 1)) { if (data->display_pstate_change_enable[i] == 1) {
data->nbp_state_change_watermark[i] = bw_add(bw_add(vbios->nbp_state_change_latency, data->dmif_burst_time[data->y_clk_level][data->sclk_level]), bw_max2(data->line_source_pixels_transfer_time, data->dram_speed_change_line_source_transfer_time[i][data->y_clk_level][data->sclk_level])); data->nbp_state_change_watermark[i] = bw_add(bw_add(vbios->nbp_state_change_latency, data->dmif_burst_time[data->y_clk_level][data->sclk_level]), bw_max2(data->line_source_pixels_transfer_time, data->dram_speed_change_line_source_transfer_time[i][data->y_clk_level][data->sclk_level]));
} }
else { else {
...@@ -1816,7 +1816,7 @@ static void calculate_bandwidth( ...@@ -1816,7 +1816,7 @@ static void calculate_bandwidth(
data->urgent_watermark[i] = bw_add(bw_add(bw_add(bw_add(bw_add(vbios->mcifwrmc_urgent_latency, data->mcifwr_burst_time[data->y_clk_level][data->sclk_level]), bw_max2(data->line_source_pixels_transfer_time, data->line_source_transfer_time[i][data->y_clk_level][data->sclk_level])), vbios->blackout_duration), data->chunk_request_time), data->cursor_request_time); data->urgent_watermark[i] = bw_add(bw_add(bw_add(bw_add(bw_add(vbios->mcifwrmc_urgent_latency, data->mcifwr_burst_time[data->y_clk_level][data->sclk_level]), bw_max2(data->line_source_pixels_transfer_time, data->line_source_transfer_time[i][data->y_clk_level][data->sclk_level])), vbios->blackout_duration), data->chunk_request_time), data->cursor_request_time);
data->stutter_exit_watermark[i] = bw_int_to_fixed(0); data->stutter_exit_watermark[i] = bw_int_to_fixed(0);
data->stutter_entry_watermark[i] = bw_int_to_fixed(0); data->stutter_entry_watermark[i] = bw_int_to_fixed(0);
if ((data->display_pstate_change_enable[i] == 1)) { if (data->display_pstate_change_enable[i] == 1) {
data->nbp_state_change_watermark[i] = bw_add(bw_add(vbios->nbp_state_change_latency, data->mcifwr_burst_time[data->y_clk_level][data->sclk_level]), bw_max2(data->line_source_pixels_transfer_time, data->dram_speed_change_line_source_transfer_time[i][data->y_clk_level][data->sclk_level])); data->nbp_state_change_watermark[i] = bw_add(bw_add(vbios->nbp_state_change_latency, data->mcifwr_burst_time[data->y_clk_level][data->sclk_level]), bw_max2(data->line_source_pixels_transfer_time, data->dram_speed_change_line_source_transfer_time[i][data->y_clk_level][data->sclk_level]));
} }
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment