diff options
author | Matthias Kaehlcke <mka@chromium.org> | 2018-02-07 14:49:28 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:19:43 -0500 |
commit | 81875979f0b29e56e385b9211666ea1b086024b6 (patch) | |
tree | b3c77c4c785077cccfa7fda24f069db8ea61f86a | |
parent | e966a725c0d87cc6a591ca3cfe04aaefc9e09ea6 (diff) |
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: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c index 2e11fac2a63d..bb03a9c64d5a 100644 --- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | |||
@@ -623,7 +623,7 @@ static void calculate_bandwidth( | |||
623 | } | 623 | } |
624 | else { | 624 | else { |
625 | /*graphics portrait tiling mode*/ | 625 | /*graphics portrait tiling mode*/ |
626 | if ((data->graphics_micro_tile_mode == bw_def_rotated_micro_tiling)) { | 626 | if (data->graphics_micro_tile_mode == bw_def_rotated_micro_tiling) { |
627 | data->orthogonal_rotation[i] = 0; | 627 | data->orthogonal_rotation[i] = 0; |
628 | } | 628 | } |
629 | else { | 629 | else { |
@@ -634,7 +634,7 @@ static void calculate_bandwidth( | |||
634 | else { | 634 | else { |
635 | if ((i < 4)) { | 635 | if ((i < 4)) { |
636 | /*underlay landscape tiling mode is only supported*/ | 636 | /*underlay landscape tiling mode is only supported*/ |
637 | if ((data->underlay_micro_tile_mode == bw_def_display_micro_tiling)) { | 637 | if (data->underlay_micro_tile_mode == bw_def_display_micro_tiling) { |
638 | data->orthogonal_rotation[i] = 0; | 638 | data->orthogonal_rotation[i] = 0; |
639 | } | 639 | } |
640 | else { | 640 | else { |
@@ -643,7 +643,7 @@ static void calculate_bandwidth( | |||
643 | } | 643 | } |
644 | else { | 644 | else { |
645 | /*graphics landscape tiling mode*/ | 645 | /*graphics landscape tiling mode*/ |
646 | if ((data->graphics_micro_tile_mode == bw_def_display_micro_tiling)) { | 646 | if (data->graphics_micro_tile_mode == bw_def_display_micro_tiling) { |
647 | data->orthogonal_rotation[i] = 0; | 647 | data->orthogonal_rotation[i] = 0; |
648 | } | 648 | } |
649 | else { | 649 | else { |
@@ -947,14 +947,14 @@ static void calculate_bandwidth( | |||
947 | } | 947 | } |
948 | for (i = 0; i <= maximum_number_of_surfaces - 1; i++) { | 948 | for (i = 0; i <= maximum_number_of_surfaces - 1; i++) { |
949 | if (data->enable[i]) { | 949 | if (data->enable[i]) { |
950 | if ((data->number_of_displays == 1 && data->number_of_underlay_surfaces == 0)) { | 950 | if (data->number_of_displays == 1 && data->number_of_underlay_surfaces == 0) { |
951 | /*set maximum chunk limit if only one graphic pipe is enabled*/ | 951 | /*set maximum chunk limit if only one graphic pipe is enabled*/ |
952 | data->outstanding_chunk_request_limit[i] = bw_int_to_fixed(127); | 952 | data->outstanding_chunk_request_limit[i] = bw_int_to_fixed(127); |
953 | } | 953 | } |
954 | else { | 954 | else { |
955 | 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)); | 955 | 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)); |
956 | /*clamp maximum chunk limit in the graphic display pipe*/ | 956 | /*clamp maximum chunk limit in the graphic display pipe*/ |
957 | if ((i >= 4)) { | 957 | if (i >= 4) { |
958 | data->outstanding_chunk_request_limit[i] = bw_max2(bw_int_to_fixed(127), data->outstanding_chunk_request_limit[i]); | 958 | data->outstanding_chunk_request_limit[i] = bw_max2(bw_int_to_fixed(127), data->outstanding_chunk_request_limit[i]); |
959 | } | 959 | } |
960 | } | 960 | } |
@@ -1337,7 +1337,7 @@ static void calculate_bandwidth( | |||
1337 | /*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*/ | 1337 | /*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*/ |
1338 | for (i = 0; i <= maximum_number_of_surfaces - 1; i++) { | 1338 | for (i = 0; i <= maximum_number_of_surfaces - 1; i++) { |
1339 | if (data->enable[i]) { | 1339 | if (data->enable[i]) { |
1340 | if ((dceip->graphics_lb_nodownscaling_multi_line_prefetching == 1)) { | 1340 | if (dceip->graphics_lb_nodownscaling_multi_line_prefetching == 1) { |
1341 | 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)); | 1341 | 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)); |
1342 | } | 1342 | } |
1343 | else { | 1343 | else { |
@@ -1396,7 +1396,7 @@ static void calculate_bandwidth( | |||
1396 | } | 1396 | } |
1397 | /*determine the number of displays with margin to switch in the v_active region*/ | 1397 | /*determine the number of displays with margin to switch in the v_active region*/ |
1398 | for (k = 0; k <= maximum_number_of_surfaces - 1; k++) { | 1398 | for (k = 0; k <= maximum_number_of_surfaces - 1; k++) { |
1399 | if ((data->enable[k] == 1 && data->display_pstate_change_enable[k] == 1)) { | 1399 | if (data->enable[k] == 1 && data->display_pstate_change_enable[k] == 1) { |
1400 | number_of_displays_enabled_with_margin = number_of_displays_enabled_with_margin + 1; | 1400 | number_of_displays_enabled_with_margin = number_of_displays_enabled_with_margin + 1; |
1401 | } | 1401 | } |
1402 | } | 1402 | } |
@@ -1442,7 +1442,7 @@ static void calculate_bandwidth( | |||
1442 | data->nbp_state_change_enable = bw_def_no; | 1442 | data->nbp_state_change_enable = bw_def_no; |
1443 | } | 1443 | } |
1444 | /*dram clock change is possible only in vblank if all displays are aligned and have no margin*/ | 1444 | /*dram clock change is possible only in vblank if all displays are aligned and have no margin*/ |
1445 | if ((number_of_aligned_displays_with_no_margin == number_of_displays_enabled)) { | 1445 | if (number_of_aligned_displays_with_no_margin == number_of_displays_enabled) { |
1446 | nbp_state_change_enable_blank = bw_def_yes; | 1446 | nbp_state_change_enable_blank = bw_def_yes; |
1447 | } | 1447 | } |
1448 | else { | 1448 | else { |
@@ -1470,7 +1470,7 @@ static void calculate_bandwidth( | |||
1470 | } | 1470 | } |
1471 | } | 1471 | } |
1472 | /*compute minimum time to read one chunk from the dmif buffer*/ | 1472 | /*compute minimum time to read one chunk from the dmif buffer*/ |
1473 | if ((number_of_displays_enabled > 2)) { | 1473 | if (number_of_displays_enabled > 2) { |
1474 | data->chunk_request_delay = 0; | 1474 | data->chunk_request_delay = 0; |
1475 | } | 1475 | } |
1476 | else { | 1476 | else { |
@@ -1804,7 +1804,7 @@ static void calculate_bandwidth( | |||
1804 | data->stutter_exit_watermark[i] = bw_add(bw_sub(vbios->stutter_self_refresh_exit_latency, data->total_dmifmc_urgent_latency), data->urgent_watermark[i]); | 1804 | data->stutter_exit_watermark[i] = bw_add(bw_sub(vbios->stutter_self_refresh_exit_latency, data->total_dmifmc_urgent_latency), data->urgent_watermark[i]); |
1805 | 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]); | 1805 | 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]); |
1806 | /*unconditionally remove black out time from the nb p_state watermark*/ | 1806 | /*unconditionally remove black out time from the nb p_state watermark*/ |
1807 | if ((data->display_pstate_change_enable[i] == 1)) { | 1807 | if (data->display_pstate_change_enable[i] == 1) { |
1808 | 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])); | 1808 | 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])); |
1809 | } | 1809 | } |
1810 | else { | 1810 | else { |
@@ -1816,7 +1816,7 @@ static void calculate_bandwidth( | |||
1816 | 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); | 1816 | 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); |
1817 | data->stutter_exit_watermark[i] = bw_int_to_fixed(0); | 1817 | data->stutter_exit_watermark[i] = bw_int_to_fixed(0); |
1818 | data->stutter_entry_watermark[i] = bw_int_to_fixed(0); | 1818 | data->stutter_entry_watermark[i] = bw_int_to_fixed(0); |
1819 | if ((data->display_pstate_change_enable[i] == 1)) { | 1819 | if (data->display_pstate_change_enable[i] == 1) { |
1820 | 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])); | 1820 | 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])); |
1821 | } | 1821 | } |
1822 | else { | 1822 | else { |