leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: drop min/max wrappers

Browse Source 
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>
This commit is contained in:
Dave Airlie 2017-01-10 08:35:47 +10:00 committed by Alex Deucher
parent 00c91d0d48
commit 7d7024ca20
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -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);

4
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
View File

@ -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;

2
drivers/gpu/drm/amd/display/dc/os_types.h
View File

@ -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