Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net> On 01/10/2017 09:35 AM, Dave Airlie wrote: > From: Dave Airlie <airlied at redhat.com> > > These aren't needed, and aren't really used in too many places. > > Signed-off-by: Dave Airlie <airlied at redhat.com> > --- > drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- > drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 4 ++-- > 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 69819d8..763d1e3 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c > @@ -628,7 +628,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 2626120..dd922bd 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 7f0c282..27ed2a6 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 > > > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20170110/5aedc39b/attachment.sig>
