[PATCH] dc_dmub_srv: Use max()/min() function for better coding conventions

[Yang Rong]

It is advisable to utilize the max() function in the dc_dmub_srv.c file, 
as it conforms better to programming conventions.

Signed-off-by: Yang Rong <yangr...@vivo.com>
---
 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c

diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c 
b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
index c753c6f30dd7..df79aea49a3c
--- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
@@ -22,7 +22,7 @@
  * Authors: AMD
  *
  */
-
+#include <linux/minmax.h>
 #include "dc.h"
 #include "dc_dmub_srv.h"
 #include "../dmub/dmub_srv.h"
@@ -481,7 +481,7 @@ static void populate_subvp_cmd_drr_info(struct dc *dc,
        max_drr_vblank_us = div64_u64((subvp_active_us - prefetch_us -
                        dc->caps.subvp_fw_processing_delay_us - drr_active_us), 
2) + drr_active_us;
        max_drr_mallregion_us = subvp_active_us - prefetch_us - mall_region_us 
- dc->caps.subvp_fw_processing_delay_us;
-       max_drr_supported_us = max_drr_vblank_us > max_drr_mallregion_us ? 
max_drr_vblank_us : max_drr_mallregion_us;
+       max_drr_supported_us = max(max_drr_vblank_us, max_drr_mallregion_us);
        max_vtotal_supported = div64_u64(((uint64_t)drr_timing->pix_clk_100hz * 
100 * max_drr_supported_us),
                        (((uint64_t)drr_timing->h_total * 1000000)));
 
@@ -771,7 +771,7 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc,
                wm_val_refclk = 
context->bw_ctx.bw.dcn.watermarks.a.cstate_pstate.pstate_change_ns *
                                (dc->res_pool->ref_clocks.dchub_ref_clock_inKhz 
/ 1000) / 1000;
 
-               cmd.fw_assisted_mclk_switch_v2.config_data.watermark_a_cache = 
wm_val_refclk < 0xFFFF ? wm_val_refclk : 0xFFFF;
+               cmd.fw_assisted_mclk_switch_v2.config_data.watermark_a_cache = 
min(wm_val_refclk, 0xFFFF);
        }
 
        dm_execute_dmub_cmd(dc->ctx, &cmd, DM_DMUB_WAIT_TYPE_WAIT);
-- 
2.35.3