diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-03-31 07:12:01 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-31 11:28:58 -0400 |
commit | 1652d19e66c2dd118bd263ccba2a951b7946a2bb (patch) | |
tree | cf5a0a41a3449563308fb10e124ee3f0d96f0484 /drivers/gpu/drm/i915/intel_pm.c | |
parent | 469d4b2a4ed7a255ffef31fad9d56bb6f7ac1213 (diff) |
drm/i915: Convert the ddi cdclk code to get_display_clock_speed
Unify the HSW/BDW/SKL cdclk extraction code to conform to the same
.get_display_clock_speed() mold that all the other platforms
use.
v2: Update due to SKL code getting added
v3: Rebase on top of -nightly (introduction of intel_audio.c) (Mika Kahola)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Add v3 note as suggested by Damien.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index fa4ccb346389..e1392e79c5c4 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -1792,7 +1792,7 @@ hsw_compute_linetime_wm(struct drm_device *dev, struct drm_crtc *crtc) | |||
1792 | linetime = DIV_ROUND_CLOSEST(mode->crtc_htotal * 1000 * 8, | 1792 | linetime = DIV_ROUND_CLOSEST(mode->crtc_htotal * 1000 * 8, |
1793 | mode->crtc_clock); | 1793 | mode->crtc_clock); |
1794 | ips_linetime = DIV_ROUND_CLOSEST(mode->crtc_htotal * 1000 * 8, | 1794 | ips_linetime = DIV_ROUND_CLOSEST(mode->crtc_htotal * 1000 * 8, |
1795 | intel_ddi_get_cdclk_freq(dev_priv)); | 1795 | dev_priv->display.get_display_clock_speed(dev_priv->dev)); |
1796 | 1796 | ||
1797 | return PIPE_WM_LINETIME_IPS_LINETIME(ips_linetime) | | 1797 | return PIPE_WM_LINETIME_IPS_LINETIME(ips_linetime) | |
1798 | PIPE_WM_LINETIME_TIME(linetime); | 1798 | PIPE_WM_LINETIME_TIME(linetime); |