Commit 7d7024ca authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher
Browse files

drm/amd/display: drop min/max wrappers 



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

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 00c91d0d

drivers/gpu/drm/amd/display/dc/core/dc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/display/dc/os_types.h

+0 −2
Original line number Diff line number Diff line
@@ -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