drm/amd/display: drop min/max wrappers

These aren't needed, and aren't really used in too many places.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 2277f9bf4bb12824236de110af9af974208f571a..a7348573ebca83c3c873ca739d57157420beae16 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -634,7 +634,7 @@ struct dc *dc_create(const struct dc_init_data *init_params)
        full_pipe_count = core_dc->res_pool->pipe_count;
        if (core_dc->res_pool->underlay_pipe_index >= 0)
                full_pipe_count--;
-       core_dc->public.caps.max_targets = dm_min(
+       core_dc->public.caps.max_targets = min(
                        full_pipe_count,
                        core_dc->res_pool->stream_enc_count);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index 262612061c68bae54a4dcd42e0346686449d79bc..dd922bdcc145d7890c4efdde95751ce01d454bd5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -289,7 +289,7 @@ static void dce_set_clock(
 
        /* Make sure requested clock isn't lower than minimum threshold*/
        if (requested_clk_khz > 0)
-               requested_clk_khz = dm_max(requested_clk_khz,
+               requested_clk_khz = max(requested_clk_khz,
                                clk_dce->dentist_vco_freq_khz / 64);
 
        /* Prepare to program display clock*/
@@ -364,7 +364,7 @@ static void dce112_set_clock(
 
        /* Make sure requested clock isn't lower than minimum threshold*/
        if (requested_clk_khz > 0)
-               requested_clk_khz = dm_max(requested_clk_khz,
+               requested_clk_khz = max(requested_clk_khz,
                                clk_dce->dentist_vco_freq_khz / 62);
 
        dce_clk_params.target_clock_frequency = requested_clk_khz;

diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h
index 7f0c282a14666b00e037257e5509c56165f0fd32..27ed2a61c3c81d5d31c955b4fb7d38a07587d1b6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/os_types.h
+++ b/drivers/gpu/drm/amd/display/dc/os_types.h
@@ -52,8 +52,6 @@
 
 #define dm_vlog(fmt, args) vprintk(fmt, args)
 
-#define dm_min(x, y) min(x, y)
-#define dm_max(x, y) max(x, y)
 #endif