aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2016-05-11 15:44:50 -0400
committerVille Syrjälä <ville.syrjala@linux.intel.com>2016-05-13 14:31:19 -0400
commit3861fc607e64aeefa1e480657bd57f269d0e4129 (patch)
treede522aed53055de31d64e44b43828a0a5f867166 /drivers/gpu/drm/i915/intel_display.c
parent9ef56154d4b18c6916c1b64bc0cd4b12ccd6fb2d (diff)
drm/i915: s/required_vco/vco/ in skl cdclk code
The 'required' part of 'required_vco' should be obvious. Let's just call it 'vco' for brevity. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1462995892-32416-12-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3552d71adb8d..176d23fa49c3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5556,13 +5556,13 @@ static unsigned int skl_cdclk_get_vco(unsigned int freq)
5556} 5556}
5557 5557
5558static void 5558static void
5559skl_dpll0_enable(struct drm_i915_private *dev_priv, unsigned int required_vco) 5559skl_dpll0_enable(struct drm_i915_private *dev_priv, int vco)
5560{ 5560{
5561 int min_cdclk; 5561 int min_cdclk;
5562 u32 val; 5562 u32 val;
5563 5563
5564 /* select the minimum CDCLK before enabling DPLL 0 */ 5564 /* select the minimum CDCLK before enabling DPLL 0 */
5565 if (required_vco == 8640) 5565 if (vco == 8640)
5566 min_cdclk = 308570; 5566 min_cdclk = 308570;
5567 else 5567 else
5568 min_cdclk = 337500; 5568 min_cdclk = 337500;
@@ -5585,7 +5585,7 @@ skl_dpll0_enable(struct drm_i915_private *dev_priv, unsigned int required_vco)
5585 val &= ~(DPLL_CTRL1_HDMI_MODE(SKL_DPLL0) | DPLL_CTRL1_SSC(SKL_DPLL0) | 5585 val &= ~(DPLL_CTRL1_HDMI_MODE(SKL_DPLL0) | DPLL_CTRL1_SSC(SKL_DPLL0) |
5586 DPLL_CTRL1_LINK_RATE_MASK(SKL_DPLL0)); 5586 DPLL_CTRL1_LINK_RATE_MASK(SKL_DPLL0));
5587 val |= DPLL_CTRL1_OVERRIDE(SKL_DPLL0); 5587 val |= DPLL_CTRL1_OVERRIDE(SKL_DPLL0);
5588 if (required_vco == 8640) 5588 if (vco == 8640)
5589 val |= DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1080, 5589 val |= DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1080,
5590 SKL_DPLL0); 5590 SKL_DPLL0);
5591 else 5591 else
@@ -5699,13 +5699,13 @@ void skl_uninit_cdclk(struct drm_i915_private *dev_priv)
5699 5699
5700void skl_init_cdclk(struct drm_i915_private *dev_priv) 5700void skl_init_cdclk(struct drm_i915_private *dev_priv)
5701{ 5701{
5702 unsigned int required_vco; 5702 unsigned int vco;
5703 5703
5704 /* DPLL0 not enabled (happens on early BIOS versions) */ 5704 /* DPLL0 not enabled (happens on early BIOS versions) */
5705 if (!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE)) { 5705 if (!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE)) {
5706 /* enable DPLL0 */ 5706 /* enable DPLL0 */
5707 required_vco = skl_cdclk_get_vco(dev_priv->skl_boot_cdclk); 5707 vco = skl_cdclk_get_vco(dev_priv->skl_boot_cdclk);
5708 skl_dpll0_enable(dev_priv, required_vco); 5708 skl_dpll0_enable(dev_priv, vco);
5709 } 5709 }
5710 5710
5711 /* set CDCLK to the frequency the BIOS chose */ 5711 /* set CDCLK to the frequency the BIOS chose */