On Tue, Mar 31, 2015 at 02:15:56PM +0100, Damien Lespiau wrote: > On Tue, Mar 31, 2015 at 02:12:01PM +0300, Mika Kahola wrote: > > 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 > > Having done the same rebase last week, I'm fairly sure there were some > work needed (intel_audio.c didn't exist in the v2 of this patch). > Usually that's enough a v3 comment: > > v3: Rebase on top of -nightly (introduction of intel_audio.c) (Mika Kahola) > > or something.
Added and merged all the reviewed patches, thanks. -Daniel > > Reviewed-by: Damien Lespiau <[email protected]> > > > Signed-off-by: Ville Syrjälä <[email protected]> > > Signed-off-by: Mika Kahola <[email protected]> > > --- > > drivers/gpu/drm/i915/intel_audio.c | 3 +- > > drivers/gpu/drm/i915/intel_ddi.c | 101 > > +---------------------------------- > > drivers/gpu/drm/i915/intel_display.c | 98 > > ++++++++++++++++++++++++++++++++- > > drivers/gpu/drm/i915/intel_dp.c | 2 +- > > drivers/gpu/drm/i915/intel_drv.h | 1 - > > drivers/gpu/drm/i915/intel_pm.c | 2 +- > > 6 files changed, 102 insertions(+), 105 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_audio.c > > b/drivers/gpu/drm/i915/intel_audio.c > > index 2396cc7..0d5b1ce 100644 > > --- a/drivers/gpu/drm/i915/intel_audio.c > > +++ b/drivers/gpu/drm/i915/intel_audio.c > > @@ -485,7 +485,8 @@ static int i915_audio_component_get_cdclk_freq(struct > > device *dev) > > return -ENODEV; > > > > intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO); > > - ret = intel_ddi_get_cdclk_freq(dev_priv); > > + ret = dev_priv->display.get_display_clock_speed(dev_priv->dev); > > + > > intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO); > > > > return ret; > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c > > b/drivers/gpu/drm/i915/intel_ddi.c > > index 47b9307..8c692d8 100644 > > --- a/drivers/gpu/drm/i915/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/intel_ddi.c > > @@ -1689,105 +1689,6 @@ static void intel_disable_ddi(struct intel_encoder > > *intel_encoder) > > } > > } > > > > -static int skl_get_cdclk_freq(struct drm_i915_private *dev_priv) > > -{ > > - uint32_t lcpll1 = I915_READ(LCPLL1_CTL); > > - uint32_t cdctl = I915_READ(CDCLK_CTL); > > - uint32_t linkrate; > > - > > - if (!(lcpll1 & LCPLL_PLL_ENABLE)) { > > - WARN(1, "LCPLL1 not enabled\n"); > > - return 24000; /* 24MHz is the cd freq with NSSC ref */ > > - } > > - > > - if ((cdctl & CDCLK_FREQ_SEL_MASK) == CDCLK_FREQ_540) > > - return 540000; > > - > > - linkrate = (I915_READ(DPLL_CTRL1) & > > - DPLL_CRTL1_LINK_RATE_MASK(SKL_DPLL0)) >> 1; > > - > > - if (linkrate == DPLL_CRTL1_LINK_RATE_2160 || > > - linkrate == DPLL_CRTL1_LINK_RATE_1080) { > > - /* vco 8640 */ > > - switch (cdctl & CDCLK_FREQ_SEL_MASK) { > > - case CDCLK_FREQ_450_432: > > - return 432000; > > - case CDCLK_FREQ_337_308: > > - return 308570; > > - case CDCLK_FREQ_675_617: > > - return 617140; > > - default: > > - WARN(1, "Unknown cd freq selection\n"); > > - } > > - } else { > > - /* vco 8100 */ > > - switch (cdctl & CDCLK_FREQ_SEL_MASK) { > > - case CDCLK_FREQ_450_432: > > - return 450000; > > - case CDCLK_FREQ_337_308: > > - return 337500; > > - case CDCLK_FREQ_675_617: > > - return 675000; > > - default: > > - WARN(1, "Unknown cd freq selection\n"); > > - } > > - } > > - > > - /* error case, do as if DPLL0 isn't enabled */ > > - return 24000; > > -} > > - > > -static int bdw_get_cdclk_freq(struct drm_i915_private *dev_priv) > > -{ > > - uint32_t lcpll = I915_READ(LCPLL_CTL); > > - uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; > > - > > - if (lcpll & LCPLL_CD_SOURCE_FCLK) > > - return 800000; > > - else if (I915_READ(FUSE_STRAP) & HSW_CDCLK_LIMIT) > > - return 450000; > > - else if (freq == LCPLL_CLK_FREQ_450) > > - return 450000; > > - else if (freq == LCPLL_CLK_FREQ_54O_BDW) > > - return 540000; > > - else if (freq == LCPLL_CLK_FREQ_337_5_BDW) > > - return 337500; > > - else > > - return 675000; > > -} > > - > > -static int hsw_get_cdclk_freq(struct drm_i915_private *dev_priv) > > -{ > > - struct drm_device *dev = dev_priv->dev; > > - uint32_t lcpll = I915_READ(LCPLL_CTL); > > - uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; > > - > > - if (lcpll & LCPLL_CD_SOURCE_FCLK) > > - return 800000; > > - else if (I915_READ(FUSE_STRAP) & HSW_CDCLK_LIMIT) > > - return 450000; > > - else if (freq == LCPLL_CLK_FREQ_450) > > - return 450000; > > - else if (IS_HSW_ULT(dev)) > > - return 337500; > > - else > > - return 540000; > > -} > > - > > -int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv) > > -{ > > - struct drm_device *dev = dev_priv->dev; > > - > > - if (IS_SKYLAKE(dev)) > > - return skl_get_cdclk_freq(dev_priv); > > - > > - if (IS_BROADWELL(dev)) > > - return bdw_get_cdclk_freq(dev_priv); > > - > > - /* Haswell */ > > - return hsw_get_cdclk_freq(dev_priv); > > -} > > - > > static void hsw_ddi_pll_enable(struct drm_i915_private *dev_priv, > > struct intel_shared_dpll *pll) > > { > > @@ -1974,7 +1875,7 @@ void intel_ddi_pll_init(struct drm_device *dev) > > hsw_shared_dplls_init(dev_priv); > > > > DRM_DEBUG_KMS("CDCLK running at %dKHz\n", > > - intel_ddi_get_cdclk_freq(dev_priv)); > > + dev_priv->display.get_display_clock_speed(dev)); > > > > if (IS_SKYLAKE(dev)) { > > if (!(I915_READ(LCPLL1_CTL) & LCPLL_PLL_ENABLE)) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > > b/drivers/gpu/drm/i915/intel_display.c > > index 4a4fdb0..6e33258 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -5864,6 +5864,93 @@ static int intel_crtc_compute_config(struct > > intel_crtc *crtc, > > return 0; > > } > > > > +static int skylake_get_display_clock_speed(struct drm_device *dev) > > +{ > > + struct drm_i915_private *dev_priv = to_i915(dev); > > + uint32_t lcpll1 = I915_READ(LCPLL1_CTL); > > + uint32_t cdctl = I915_READ(CDCLK_CTL); > > + uint32_t linkrate; > > + > > + if (!(lcpll1 & LCPLL_PLL_ENABLE)) { > > + WARN(1, "LCPLL1 not enabled\n"); > > + return 24000; /* 24MHz is the cd freq with NSSC ref */ > > + } > > + > > + if ((cdctl & CDCLK_FREQ_SEL_MASK) == CDCLK_FREQ_540) > > + return 540000; > > + > > + linkrate = (I915_READ(DPLL_CTRL1) & > > + DPLL_CRTL1_LINK_RATE_MASK(SKL_DPLL0)) >> 1; > > + > > + if (linkrate == DPLL_CRTL1_LINK_RATE_2160 || > > + linkrate == DPLL_CRTL1_LINK_RATE_1080) { > > + /* vco 8640 */ > > + switch (cdctl & CDCLK_FREQ_SEL_MASK) { > > + case CDCLK_FREQ_450_432: > > + return 432000; > > + case CDCLK_FREQ_337_308: > > + return 308570; > > + case CDCLK_FREQ_675_617: > > + return 617140; > > + default: > > + WARN(1, "Unknown cd freq selection\n"); > > + } > > + } else { > > + /* vco 8100 */ > > + switch (cdctl & CDCLK_FREQ_SEL_MASK) { > > + case CDCLK_FREQ_450_432: > > + return 450000; > > + case CDCLK_FREQ_337_308: > > + return 337500; > > + case CDCLK_FREQ_675_617: > > + return 675000; > > + default: > > + WARN(1, "Unknown cd freq selection\n"); > > + } > > + } > > + > > + /* error case, do as if DPLL0 isn't enabled */ > > + return 24000; > > +} > > + > > +static int broadwell_get_display_clock_speed(struct drm_device *dev) > > +{ > > + struct drm_i915_private *dev_priv = dev->dev_private; > > + uint32_t lcpll = I915_READ(LCPLL_CTL); > > + uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; > > + > > + if (lcpll & LCPLL_CD_SOURCE_FCLK) > > + return 800000; > > + else if (I915_READ(FUSE_STRAP) & HSW_CDCLK_LIMIT) > > + return 450000; > > + else if (freq == LCPLL_CLK_FREQ_450) > > + return 450000; > > + else if (freq == LCPLL_CLK_FREQ_54O_BDW) > > + return 540000; > > + else if (freq == LCPLL_CLK_FREQ_337_5_BDW) > > + return 337500; > > + else > > + return 675000; > > +} > > + > > +static int haswell_get_display_clock_speed(struct drm_device *dev) > > +{ > > + struct drm_i915_private *dev_priv = dev->dev_private; > > + uint32_t lcpll = I915_READ(LCPLL_CTL); > > + uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; > > + > > + if (lcpll & LCPLL_CD_SOURCE_FCLK) > > + return 800000; > > + else if (I915_READ(FUSE_STRAP) & HSW_CDCLK_LIMIT) > > + return 450000; > > + else if (freq == LCPLL_CLK_FREQ_450) > > + return 450000; > > + else if (IS_HSW_ULT(dev)) > > + return 337500; > > + else > > + return 540000; > > +} > > + > > static int valleyview_get_display_clock_speed(struct drm_device *dev) > > { > > struct drm_i915_private *dev_priv = dev->dev_private; > > @@ -13687,7 +13774,16 @@ static void intel_init_display(struct drm_device > > *dev) > > } > > > > /* Returns the core display clock speed */ > > - if (IS_VALLEYVIEW(dev)) > > + if (IS_SKYLAKE(dev)) > > + dev_priv->display.get_display_clock_speed = > > + skylake_get_display_clock_speed; > > + else if (IS_BROADWELL(dev)) > > + dev_priv->display.get_display_clock_speed = > > + broadwell_get_display_clock_speed; > > + else if (IS_HASWELL(dev)) > > + dev_priv->display.get_display_clock_speed = > > + haswell_get_display_clock_speed; > > + else if (IS_VALLEYVIEW(dev)) > > dev_priv->display.get_display_clock_speed = > > valleyview_get_display_clock_speed; > > else if (IS_GEN5(dev)) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c > > b/drivers/gpu/drm/i915/intel_dp.c > > index e38dbd5..047a52e 100644 > > --- a/drivers/gpu/drm/i915/intel_dp.c > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > @@ -717,7 +717,7 @@ static uint32_t hsw_get_aux_clock_divider(struct > > intel_dp *intel_dp, int index) > > if (intel_dig_port->port == PORT_A) { > > if (index) > > return 0; > > - return DIV_ROUND_CLOSEST(intel_ddi_get_cdclk_freq(dev_priv), > > 2000); > > + return > > DIV_ROUND_CLOSEST(dev_priv->display.get_display_clock_speed(dev), 2000); > > } else if (dev_priv->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE) { > > /* Workaround for non-ULT HSW */ > > switch (index) { > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > > b/drivers/gpu/drm/i915/intel_drv.h > > index fca7b9f..4f2ed95 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -856,7 +856,6 @@ void hsw_fdi_link_train(struct drm_crtc *crtc); > > void intel_ddi_init(struct drm_device *dev, enum port port); > > enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); > > bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe > > *pipe); > > -int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); > > void intel_ddi_pll_init(struct drm_device *dev); > > void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); > > void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, > > diff --git a/drivers/gpu/drm/i915/intel_pm.c > > b/drivers/gpu/drm/i915/intel_pm.c > > index fa4ccb3..e1392e7 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) > > linetime = DIV_ROUND_CLOSEST(mode->crtc_htotal * 1000 * 8, > > mode->crtc_clock); > > ips_linetime = DIV_ROUND_CLOSEST(mode->crtc_htotal * 1000 * 8, > > - intel_ddi_get_cdclk_freq(dev_priv)); > > + > > dev_priv->display.get_display_clock_speed(dev_priv->dev)); > > > > return PIPE_WM_LINETIME_IPS_LINETIME(ips_linetime) | > > PIPE_WM_LINETIME_TIME(linetime); > > -- > > 1.9.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > [email protected] > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
