| Message ID | 1412030973-16738-3-git-send-email-ullysses.a.eoff@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-By: Joe Konno <joe.konno@intel.com> On 09/29/2014 03:49 PM, U. Artie Eoff wrote: > Move the duplicated DIV_ROUND_CLOSEST_ULL macro into the intel_drv.h > header file so that it can be shared between intel_display.c > and intel_panel.c. > > Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 3 --- > drivers/gpu/drm/i915/intel_drv.h | 3 +++ > drivers/gpu/drm/i915/intel_panel.c | 3 --- > 3 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 5b05ddb..db800f2 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -73,9 +73,6 @@ static const uint32_t intel_cursor_formats[] = { > DRM_FORMAT_ARGB8888, > }; > > -#define DIV_ROUND_CLOSEST_ULL(ll, d) \ > -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) > - > static void intel_increase_pllclock(struct drm_device *dev, > enum pipe pipe); > static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on); > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 1b72c15..8401ae3 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -36,6 +36,9 @@ > #include <drm/drm_dp_mst_helper.h> > #include <drm/drm_rect.h> > > +#define DIV_ROUND_CLOSEST_ULL(ll, d) \ > +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) > + > /** > * _wait_for - magic (register) wait macro > * > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > index f7da913..fade0dd 100644 > --- a/drivers/gpu/drm/i915/intel_panel.c > +++ b/drivers/gpu/drm/i915/intel_panel.c > @@ -398,9 +398,6 @@ intel_panel_detect(struct drm_device *dev) > } > } > > -#define DIV_ROUND_CLOSEST_ULL(ll, d) \ > -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) > - > /** > * scale - scale values from one range to another > *
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5b05ddb..db800f2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -73,9 +73,6 @@ static const uint32_t intel_cursor_formats[] = { DRM_FORMAT_ARGB8888, }; -#define DIV_ROUND_CLOSEST_ULL(ll, d) \ -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) - static void intel_increase_pllclock(struct drm_device *dev, enum pipe pipe); static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1b72c15..8401ae3 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -36,6 +36,9 @@ #include <drm/drm_dp_mst_helper.h> #include <drm/drm_rect.h> +#define DIV_ROUND_CLOSEST_ULL(ll, d) \ +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) + /** * _wait_for - magic (register) wait macro * diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index f7da913..fade0dd 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -398,9 +398,6 @@ intel_panel_detect(struct drm_device *dev) } } -#define DIV_ROUND_CLOSEST_ULL(ll, d) \ -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) - /** * scale - scale values from one range to another *
Move the duplicated DIV_ROUND_CLOSEST_ULL macro into the intel_drv.h header file so that it can be shared between intel_display.c and intel_panel.c. Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 3 --- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_panel.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-)