* [PATCH] drm/amd/display: drop min/max wrappers
@ 2017-01-09 22:35 Dave Airlie
[not found] ` <20170109223547.24601-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Dave Airlie @ 2017-01-09 22:35 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
From: Dave Airlie <airlied@redhat.com>
These aren't needed, and aren't really used in too many places.
Signed-off-by: Dave Airlie <airlied@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
--
2.9.3
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <20170109223547.24601-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] drm/amd/display: drop min/max wrappers [not found] ` <20170109223547.24601-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2017-01-10 1:36 ` Edward O'Callaghan [not found] ` <5dd6c190-a2e5-8acc-125b-5102f92167ef-dczkZgxz+BNUPWh3PAxdjQ@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Edward O'Callaghan @ 2017-01-10 1:36 UTC (permalink / raw) To: Dave Airlie, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW [-- Attachment #1.1.1: Type: text/plain, Size: 2622 bytes --] Reviewed-by: Edward O'Callaghan <funfunctor-dczkZgxz+BNUPWh3PAxdjQ@public.gmane.org> On 01/10/2017 09:35 AM, Dave Airlie wrote: > From: Dave Airlie <airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > > These aren't needed, and aren't really used in too many places. > > Signed-off-by: Dave Airlie <airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > --- > 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 > > > [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <5dd6c190-a2e5-8acc-125b-5102f92167ef-dczkZgxz+BNUPWh3PAxdjQ@public.gmane.org>]
* Re: [PATCH] drm/amd/display: drop min/max wrappers [not found] ` <5dd6c190-a2e5-8acc-125b-5102f92167ef-dczkZgxz+BNUPWh3PAxdjQ@public.gmane.org> @ 2017-01-10 18:42 ` Harry Wentland 0 siblings, 0 replies; 3+ messages in thread From: Harry Wentland @ 2017-01-10 18:42 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Reviewed-by: Harry Wentland <harry.wentland@amd.com> On 2017-01-09 08:36 PM, Edward O'Callaghan wrote: > Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net> > > On 01/10/2017 09:35 AM, Dave Airlie wrote: >> From: Dave Airlie <airlied@redhat.com> >> >> These aren't needed, and aren't really used in too many places. >> >> Signed-off-by: Dave Airlie <airlied@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 >> >> >> > > > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-10 18:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-09 22:35 [PATCH] drm/amd/display: drop min/max wrappers Dave Airlie
[not found] ` <20170109223547.24601-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-01-10 1:36 ` Edward O'Callaghan
[not found] ` <5dd6c190-a2e5-8acc-125b-5102f92167ef-dczkZgxz+BNUPWh3PAxdjQ@public.gmane.org>
2017-01-10 18:42 ` Harry Wentland
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.