From 709e05c3c46e866243f369a46ca5552a5c1e6b44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Fri, 13 May 2016 23:41:33 +0300 Subject: [PATCH] drm/i915: Store cdclk PLL reference clock under dev_priv MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Future platforms will have multiple options for the cdclk PLL reference clock, so let's start tracking that under dev_priv alreday on SKL, although on SKL it's always 24 MHz. Signed-off-by: Ville Syrjälä Link: http://patchwork.freedesktop.org/patch/msgid/1463172100-24715-15-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f8d8a8119b7c..78d38c246491 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1823,7 +1823,7 @@ struct drm_i915_private { unsigned int czclk_freq; struct { - unsigned int vco; + unsigned int vco, ref; } cdclk_pll; /** diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 40893c0cd960..57771639b94e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5255,8 +5255,9 @@ static void intel_update_cdclk(struct drm_device *dev) dev_priv->cdclk_freq = dev_priv->display.get_display_clock_speed(dev); if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) - DRM_DEBUG_DRIVER("Current CD clock rate: %d kHz, VCO: %d kHz\n", - dev_priv->cdclk_freq, dev_priv->cdclk_pll.vco); + DRM_DEBUG_DRIVER("Current CD clock rate: %d kHz, VCO: %d kHz, ref: %d kHz\n", + dev_priv->cdclk_freq, dev_priv->cdclk_pll.vco, + dev_priv->cdclk_pll.ref); else DRM_DEBUG_DRIVER("Current CD clock rate: %d kHz\n", dev_priv->cdclk_freq); @@ -5462,6 +5463,8 @@ skl_dpll0_update(struct drm_i915_private *dev_priv) { u32 val; + dev_priv->cdclk_pll.ref = 24000; + val = I915_READ(LCPLL1_CTL); if ((val & LCPLL_PLL_ENABLE) == 0) { dev_priv->cdclk_pll.vco = 0; @@ -5650,7 +5653,7 @@ static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv); void skl_uninit_cdclk(struct drm_i915_private *dev_priv) { - skl_set_cdclk(dev_priv, 24000, 0); + skl_set_cdclk(dev_priv, dev_priv->cdclk_pll.ref, 0); } void skl_init_cdclk(struct drm_i915_private *dev_priv) @@ -6572,7 +6575,7 @@ static int skylake_get_display_clock_speed(struct drm_device *dev) skl_dpll0_update(dev_priv); if (dev_priv->cdclk_pll.vco == 0) - return 24000; /* 24MHz is the cd freq with NSSC ref */ + return dev_priv->cdclk_pll.ref; cdctl = I915_READ(CDCLK_CTL); @@ -6604,8 +6607,7 @@ static int skylake_get_display_clock_speed(struct drm_device *dev) } } - /* error case, do as if DPLL0 isn't enabled */ - return 24000; + return dev_priv->cdclk_pll.ref; } static int broxton_get_display_clock_speed(struct drm_device *dev) -- 2.20.1