diff options
| author | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2014-09-29 18:49:33 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-06 10:49:27 -0400 |
| commit | 2e5416252af5239ddcd92bc858a494c1ca842778 (patch) | |
| tree | 13faee4cc18e9039b42c9d5ef439abff78b3b4f6 | |
| parent | 673e7bbdb3920b62cfc6c710bea626b0a9b0f43a (diff) | |
drm/i915: Move DIV_ROUND_CLOSEST_ULL macro to header
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>
Reviewed-By: Joe Konno <joe.konno@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 | ||||
| -rw-r--r-- | 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 507370513f3d..6a0cc367934d 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[] = { | |||
| 73 | DRM_FORMAT_ARGB8888, | 73 | DRM_FORMAT_ARGB8888, |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | #define DIV_ROUND_CLOSEST_ULL(ll, d) \ | ||
| 77 | ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) | ||
| 78 | |||
| 79 | static void intel_increase_pllclock(struct drm_device *dev, | 76 | static void intel_increase_pllclock(struct drm_device *dev, |
| 80 | enum pipe pipe); | 77 | enum pipe pipe); |
| 81 | static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on); | 78 | 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 07ce04683c30..ba715229a540 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
| @@ -35,6 +35,9 @@ | |||
| 35 | #include <drm/drm_fb_helper.h> | 35 | #include <drm/drm_fb_helper.h> |
| 36 | #include <drm/drm_dp_mst_helper.h> | 36 | #include <drm/drm_dp_mst_helper.h> |
| 37 | 37 | ||
| 38 | #define DIV_ROUND_CLOSEST_ULL(ll, d) \ | ||
| 39 | ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) | ||
| 40 | |||
| 38 | /** | 41 | /** |
| 39 | * _wait_for - magic (register) wait macro | 42 | * _wait_for - magic (register) wait macro |
| 40 | * | 43 | * |
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 97ff71f40dd3..0e018cb49147 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) | |||
| 398 | } | 398 | } |
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | #define DIV_ROUND_CLOSEST_ULL(ll, d) \ | ||
| 402 | ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) | ||
| 403 | |||
| 404 | /** | 401 | /** |
| 405 | * scale - scale values from one range to another | 402 | * scale - scale values from one range to another |
| 406 | * | 403 | * |
