aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-11-30 09:23:47 -0500
committerVille Syrjälä <ville.syrjala@linux.intel.com>2015-12-02 04:22:57 -0500
commit4e7f8cfbd22755844094caaac2d9f49d2b77fd8c (patch)
tree97495b2e6585c2477340d999f72859d6e2ab5e60
parentfce18c4cf5fac09153dff8c8726d1eabd02e59ea (diff)
drm/i915: Use cached cdclk_freq for PWM calculations
No need to read out cdclk from the hardware, we have it already cached in dev_priv. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1448893432-6978-7-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r--drivers/gpu/drm/i915/intel_panel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index eb42b388a5e9..ae808b68a44f 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1345,7 +1345,7 @@ static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
1345 if (IS_PINEVIEW(dev)) 1345 if (IS_PINEVIEW(dev))
1346 clock = MHz(intel_hrawclk(dev)); 1346 clock = MHz(intel_hrawclk(dev));
1347 else 1347 else
1348 clock = 1000 * dev_priv->display.get_display_clock_speed(dev); 1348 clock = 1000 * dev_priv->cdclk_freq;
1349 1349
1350 return clock / (pwm_freq_hz * 32); 1350 return clock / (pwm_freq_hz * 32);
1351} 1351}
@@ -1364,7 +1364,7 @@ static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
1364 if (IS_G4X(dev_priv)) 1364 if (IS_G4X(dev_priv))
1365 clock = MHz(intel_hrawclk(dev)); 1365 clock = MHz(intel_hrawclk(dev));
1366 else 1366 else
1367 clock = 1000 * dev_priv->display.get_display_clock_speed(dev); 1367 clock = 1000 * dev_priv->cdclk_freq;
1368 1368
1369 return clock / (pwm_freq_hz * 128); 1369 return clock / (pwm_freq_hz * 128);
1370} 1370}