diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-10-20 11:58:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-10-20 11:58:07 +1000 |
| commit | bee6bd0ad25f396095f0522fd441edfebd25a0cf (patch) | |
| tree | 0c5c1bb52861d74d7fbca4e1fe265f632637825e /drivers/gpu/drm/i915/intel_panel.c | |
| parent | da36bbd0bf36d415a8ad8e401d64b860f9befb44 (diff) | |
| parent | 07c338ce98263a5af631b991dd8f96cff6ca2548 (diff) | |
Merge tag 'drm-intel-next-fixes-2014-10-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes
first set of i915 fixes, all over.
* tag 'drm-intel-next-fixes-2014-10-17' of git://anongit.freedesktop.org/drm-intel:
drm/i915: fix short vs. long hpd detection
drm/i915: Don't trust the DP_DETECT bit for eDP ports on CHV
drm/i915: properly reenable gen8 pipe IRQs
drm/i915: Move DIV_ROUND_CLOSEST_ULL macro to header
drm/i915: intel_backlight scale() math WA
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 18784470a76..0e018cb4914 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -419,9 +419,8 @@ static uint32_t scale(uint32_t source_val, source_val = clamp(source_val, source_min, source_max); /* avoid overflows */ - target_val = (uint64_t)(source_val - source_min) * - (target_max - target_min); - do_div(target_val, source_max - source_min); + target_val = DIV_ROUND_CLOSEST_ULL((uint64_t)(source_val - source_min) * + (target_max - target_min), source_max - source_min); target_val += target_min; return target_val; |