diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-10 08:35:47 +1000 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:09:23 -0400 |
| commit | 7d7024ca202c502324dce683f2061b35d113a6aa (patch) | |
| tree | c7d15f3cdb88ba72d96684779f4ab52a841c2095 | |
| parent | 00c91d0d480a0c5f6507da80f7e13dab7e6b7c79 (diff) | |
| download | linux-stable-7d7024ca202c502324dce683f2061b35d113a6aa.tar.gz linux-stable-7d7024ca202c502324dce683f2061b35d113a6aa.tar.bz2 linux-stable-7d7024ca202c502324dce683f2061b35d113a6aa.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/os_types.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 2277f9bf4bb1..a7348573ebca 100644 --- 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 262612061c68..dd922bdcc145 100644 --- 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 7f0c282a1466..27ed2a61c3c8 100644 --- 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 |