drm/i915: Don't display the boot CDCLK twice
authorDamien Lespiau <damien.lespiau@intel.com>
Thu, 4 Jun 2015 17:21:32 +0000 (18:21 +0100)
committerJani Nikula <jani.nikula@intel.com>
Fri, 12 Jun 2015 10:14:36 +0000 (13:14 +0300)
intel_update_cdclk() will already display the boot CDCLK for DDI
platforms, no need to repeat there.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_ddi.c

index 3eaf5c05057378efdc81691c4fbae5575897c1ea..fff494412fe6b7abb429a2199d7a23a3903e9be0 100644 (file)
@@ -2517,7 +2517,6 @@ void intel_ddi_pll_init(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        uint32_t val = I915_READ(LCPLL_CTL);
-       int cdclk_freq;
 
        if (IS_SKYLAKE(dev))
                skl_shared_dplls_init(dev_priv);
@@ -2526,10 +2525,10 @@ void intel_ddi_pll_init(struct drm_device *dev)
        else
                hsw_shared_dplls_init(dev_priv);
 
-       cdclk_freq = dev_priv->display.get_display_clock_speed(dev);
-       DRM_DEBUG_KMS("CDCLK running at %dKHz\n", cdclk_freq);
-
        if (IS_SKYLAKE(dev)) {
+               int cdclk_freq;
+
+               cdclk_freq = dev_priv->display.get_display_clock_speed(dev);
                dev_priv->skl_boot_cdclk = cdclk_freq;
                if (!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE))
                        DRM_ERROR("LCPLL1 is disabled\n");