Split the HSW/BDW PLL code a bit more
Subsystems (2)
cover Split the HSW/BDW PLL code a bit more
Turns out we were optimistic. intel_ prefixes don't tend to last and this is one of those times.
Signature · 22 lines
Damien Damien Lespiau (10): drm/i915: Specify when the PLL hw state fields are valid drm/i915: Add a space to the shared DPLL debug message drm/i915: Extract the HSW DDI selection code into its own function drm/i915: Extract the HSW/BDW shared dpll init code drm/i915: Restrict hsw_dp_set_ddi_pll_sel() to HSW/BDW drm/i915: Fix stale comment for intel_ddi_pll_select() drm/i915: Split the BDW/HSW specific shared pll selection drm/i915: Make intel_ddi_calculate_wrpll() HSW/BDW specific drm/i915: Split the CDCLK retrieval per-platform drm/i915: Make ddi_clock_gate() HSW/BDW specific drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/intel_ddi.c | 124 +++++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_display.c | 29 ++++---- drivers/gpu/drm/i915/intel_dp.c | 2 +- 4 files changed, 105 insertions(+), 53 deletions(-) -- 1.8.3.1
PATCH 1/10 drm/i915: Specify when the PLL hw state fields are valid
Not all those fields are valid on a given platform. Make it explicit.
Unions could also be used, but were cluttering some code paths with if/else ladders.
v2: Don't use anonymous unions (Daniel)
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -197,10 +197,13 @@ enum intel_dpll_id {#define I915_NUM_PLLS 2struct intel_dpll_hw_state { +/* i9xx, pch plls */ uint32_t dpll;uint32_t dpll_md;uint32_t fp0;uint32_t fp1; + +/* hsw, bdw */ uint32_t wrpll; };
Signature · 1 line
1.8.3.1
PATCH 2/10 drm/i915: Add a space to the shared DPLL debug message
In reply to Damien Lespiau--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -1778,7 +1778,7 @@ static void intel_enable_shared_dpll(struct intel_crtc *crtc)if (WARN_ON (pll->refcount ==0 ))return ; -DRM_DEBUG_KMS ("enable %s (active %d, on? %d)for crtc %d\n" , +DRM_DEBUG_KMS ("enable %s (active %d, on? %d) for crtc %d\n" , pll->name, pll->active, pll->on, crtc->base.base.id);
Signature · 1 line
1.8.3.1
PATCH 3/10 drm/i915: Extract the HSW DDI selection code into its own function
In reply to Damien LespiauFuture platform will slightly change that.
--- drivers/gpu/drm/i915/intel_display.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +17 -10
@@ -7573,6 +7573,22 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc,return 0 ; } +static void haswell_get_ddi_pll (struct drm_i915_private *dev_priv, +enum port port, +struct intel_crtc_config *pipe_config) +{ + pipe_config->ddi_pll_sel =I915_READ (PORT_CLK_SEL (port)); + +switch (pipe_config->ddi_pll_sel) { +case PORT_CLK_SEL_WRPLL1 : + pipe_config->shared_dpll =DPLL_ID_WRPLL1 ; +break ; +case PORT_CLK_SEL_WRPLL2 : + pipe_config->shared_dpll =DPLL_ID_WRPLL2 ; +break ; + } +} +static void haswell_get_ddi_port_state (struct intel_crtc *crtc,struct intel_crtc_config *pipe_config) {
@@ -7586,16 +7602,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc, port = (tmp &TRANS_DDI_PORT_MASK ) >>TRANS_DDI_PORT_SHIFT ; - pipe_config->ddi_pll_sel =I915_READ (PORT_CLK_SEL (port)); - -switch (pipe_config->ddi_pll_sel) { -case PORT_CLK_SEL_WRPLL1 : - pipe_config->shared_dpll =DPLL_ID_WRPLL1 ; -break ; -case PORT_CLK_SEL_WRPLL2 : - pipe_config->shared_dpll =DPLL_ID_WRPLL2 ; -break ; - } +haswell_get_ddi_pll (dev_priv, port, pipe_config);if (pipe_config->shared_dpll >=0 ) { pll = &dev_priv->shared_dplls[pipe_config->shared_dpll];
Signature · 1 line
1.8.3.1
PATCH 4/10 drm/i915: Extract the HSW/BDW shared dpll init code
In reply to Damien LespiauSo we can easily provide an alternate implementation in the future.
--- drivers/gpu/drm/i915/intel_ddi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +9 -3
@@ -1248,10 +1248,8 @@ static const char * const hsw_ddi_pll_names[] = { "WRPLL 2", }; -void intel_ddi_pll_init (struct drm_device *dev) +static void hsw_shared_dplls_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv = dev->dev_private; -uint32_t val =I915_READ (LCPLL_CTL );int i; dev_priv->num_shared_dpll =2 ;
@@ -1264,6 +1262,14 @@ void intel_ddi_pll_init(struct drm_device *dev) dev_priv->shared_dplls[i].get_hw_state = hsw_ddi_pll_get_hw_state; } +} + +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 ); + +hsw_shared_dplls_init (dev_priv);/* The LCPLL register should be turned on by the BIOS. For now let's * just check its state and print errors in case something is wrong.
Signature · 1 line
1.8.3.1
PATCH 5/10 drm/i915: Restrict hsw_dp_set_ddi_pll_sel() to HSW/BDW
In reply to Damien LespiauFuture platform will use config->ddi_pll_sel in a different way.
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -976,7 +976,7 @@ found: &pipe_config->dp_m2_n2); } -if (HAS_DDI (dev)) +if (IS_HASWELL (dev) ||IS_BROADWELL (dev))hsw_dp_set_ddi_pll_sel (pipe_config, intel_dp->link_bw);else intel_dp_set_clock (encoder, pipe_config, intel_dp->link_bw);
Signature · 1 line
1.8.3.1
Re: [PATCH 05/10] drm/i915: Restrict hsw_dp_set_ddi_pll_sel() to HSW/BDW
Quoted 12 lines · Damien Lespiau
Future platform will use
config->ddi_pll_selin a different way.Signed-off-by Damien Lespiau <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +0
-0
drivers/gpu/drm/i915/intel_dp.c found: · line 982
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -976,7 +976,7 @@ found: &pipe_config->dp_m2_n2); } -if (HAS_DDI (dev)) +if (IS_HASWELL (dev) ||IS_BROADWELL (dev))hsw_dp_set_ddi_pll_sel (pipe_config, intel_dp->link_bw);else intel_dp_set_clock (encoder, pipe_config, intel_dp->link_bw);
We could do an s/intel/gmch/ here too ... Or g4x.
-Daniel
Quoted 7 lines
Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH 6/10 drm/i915: Fix stale comment for intel_ddi_pll_select()
In reply to Damien LespiauSince the run-time PM on DPMS series, this function has an outdated comment. Refresh it a bit.
--- drivers/gpu/drm/i915/intel_ddi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +5 -4
@@ -709,10 +709,11 @@ intel_ddi_calculate_wrpll(int clock /* in Hz */, }/* -* Tries to find a PLL for the CRTC. If it finds, it increases the refcount and -* stores it in intel_crtc->ddi_pll_sel, so other mode sets won't be able to -* steal the selected PLL. You need to call intel_ddi_pll_enable to actually -* enable the PLL. +* Tries to find a *shared* PLL for the CRTC and store it in +* intel_crtc->ddi_pll_sel. +* +* For private DPLLs, compute_config() should do the selection for us. This +* function should be folded into compute_config() eventually. */ bool intel_ddi_pll_select (struct intel_crtc *intel_crtc) {
Signature · 1 line
1.8.3.1
PATCH 7/10 drm/i915: Split the BDW/HSW specific shared pll selection
In reply to Damien LespiauWe'll need a different algorithm to select the shared DPLL.
--- drivers/gpu/drm/i915/intel_ddi.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +23 -16
@@ -708,23 +708,10 @@ intel_ddi_calculate_wrpll(int clock /* in Hz */, *r2_out = best.r2; } -/* -* Tries to find a *shared* PLL for the CRTC and store it in -* intel_crtc->ddi_pll_sel. -* -* For private DPLLs, compute_config() should do the selection for us. This -* function should be folded into compute_config() eventually. -*/ -bool intel_ddi_pll_select (struct intel_crtc *intel_crtc) +static bool +hsw_ddi_pll_select (struct intel_crtc *intel_crtc,int output,int clock) { -struct drm_crtc *crtc = &intel_crtc->base; -struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc); -int type = intel_encoder->type; -int clock = intel_crtc->config.port_clock; - -intel_put_shared_dpll (intel_crtc); - -if (type ==INTEL_OUTPUT_HDMI ) { +if (output ==INTEL_OUTPUT_HDMI ) {struct intel_shared_dpll *pll;uint32_t val;unsigned p, n2, r2;
@@ -750,6 +737,26 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc)return true; } + +/* +* Tries to find a *shared* PLL for the CRTC and store it in +* intel_crtc->ddi_pll_sel. +* +* For private DPLLs, compute_config() should do the selection for us. This +* function should be folded into compute_config() eventually. +*/ +bool intel_ddi_pll_select (struct intel_crtc *intel_crtc) +{ +struct drm_crtc *crtc = &intel_crtc->base; +struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc); +int type = intel_encoder->type; +int clock = intel_crtc->config.port_clock; + +intel_put_shared_dpll (intel_crtc); + +return hsw_ddi_pll_select (intel_crtc, type, clock); +} +void intel_ddi_set_pipe_settings (struct drm_crtc *crtc) {struct drm_i915_private *dev_priv = crtc->dev->dev_private;
Signature · 1 line
1.8.3.1
PATCH 8/10 drm/i915: Make intel_ddi_calculate_wrpll() HSW/BDW specific
In reply to Damien Lespiau--- drivers/gpu/drm/i915/intel_ddi.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +8 -7
@@ -644,8 +644,8 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, }static void -intel_ddi_calculate_wrpll (int clock/* in Hz */ , -unsigned *r2_out,unsigned *n2_out,unsigned *p_out) +hsw_ddi_calculate_wrpll (int clock/* in Hz */ , +unsigned *r2_out,unsigned *n2_out,unsigned *p_out) {uint64_t freq2k;unsigned p, n2, r2;
@@ -709,14 +709,16 @@ intel_ddi_calculate_wrpll(int clock /* in Hz */, }static bool -hsw_ddi_pll_select (struct intel_crtc *intel_crtc,int output,int clock) +hsw_ddi_pll_select (struct intel_crtc *intel_crtc, +struct intel_encoder *intel_encoder, +int clock) { -if (output ==INTEL_OUTPUT_HDMI ) { +if (intel_encoder->type ==INTEL_OUTPUT_HDMI ) {struct intel_shared_dpll *pll;uint32_t val;unsigned p, n2, r2; -intel_ddi_calculate_wrpll (clock *1000 , &r2, &n2, &p); +hsw_ddi_calculate_wrpll (clock *1000 , &r2, &n2, &p); val =WRPLL_PLL_ENABLE |WRPLL_PLL_LCPLL | WRPLL_DIVIDER_REFERENCE(r2) | WRPLL_DIVIDER_FEEDBACK(n2) |
@@ -749,12 +751,11 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc) {struct drm_crtc *crtc = &intel_crtc->base;struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc); -int type = intel_encoder->type;int clock = intel_crtc->config.port_clock;intel_put_shared_dpll (intel_crtc); -return hsw_ddi_pll_select (intel_crtc, type, clock); +return hsw_ddi_pll_select (intel_crtc, intel_encoder, clock); }void intel_ddi_set_pipe_settings (struct drm_crtc *crtc)
Signature · 1 line
1.8.3.1
PATCH 9/10 drm/i915: Split the CDCLK retrieval per-platform
In reply to Damien LespiauThis is only going to get worse, so split it now to avoid adding more cases to the if/else ladder.
--- drivers/gpu/drm/i915/intel_ddi.c | 55 +++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +38 -17
@@ -1192,31 +1192,52 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) } } -int intel_ddi_get_cdclk_freq (struct drm_i915_private *dev_priv) +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 ) { +if (lcpll &LCPLL_CD_SOURCE_FCLK )return 800000 ; - }else if (I915_READ (FUSE_STRAP ) &HSW_CDCLK_LIMIT ) { +else if (I915_READ (FUSE_STRAP ) &HSW_CDCLK_LIMIT )return 450000 ; - }else if (freq ==LCPLL_CLK_FREQ_450 ) { +else if (freq ==LCPLL_CLK_FREQ_450 )return 450000 ; - }else if (IS_HASWELL (dev)) { -if (IS_ULT (dev)) -return 337500 ; -else -return 540000 ; - }else { -if (freq ==LCPLL_CLK_FREQ_54O_BDW ) -return 540000 ; -else if (freq ==LCPLL_CLK_FREQ_337_5_BDW ) -return 337500 ; -else -return 675000 ; - } +else if (IS_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_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,
Signature · 1 line
1.8.3.1
PATCH 10/10 drm/i915: Make ddi_clock_gate() HSW/BDW specific
In reply to Damien LespiauTurns out we were again way too naive and optimistic, of course things will change.
--- drivers/gpu/drm/i915/intel_ddi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +9 -3
@@ -587,8 +587,8 @@ static int intel_ddi_calc_wrpll_link(struct drm_i915_private *dev_priv,return (refclk * n *100 ) / (p * r); } -void intel_ddi_clock_get (struct intel_encoder *encoder, -struct intel_crtc_config *pipe_config) +static void hsw_ddi_clock_get (struct intel_encoder *encoder, +struct intel_crtc_config *pipe_config) {struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;int link_clock =0 ;
@@ -643,6 +643,12 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, pipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock; } +void intel_ddi_clock_get (struct intel_encoder *encoder, +struct intel_crtc_config *pipe_config) +{ +hsw_ddi_clock_get (encoder, pipe_config); +} +static void hsw_ddi_calculate_wrpll (int clock/* in Hz */ ,unsigned *r2_out,unsigned *n2_out,unsigned *p_out)
@@ -1480,7 +1486,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, dev_priv->vbt.edp_bpp = pipe_config->pipe_bpp; } -intel_ddi_clock_get (encoder, pipe_config); +hsw_ddi_clock_get (encoder, pipe_config); }static void intel_ddi_destroy (struct drm_encoder *encoder)
Signature · 1 line
1.8.3.1
Quoted 2 lines · Damien Lespiau
Turns out we were optimistic.
intel_prefixes don't tend to last and this is one of those times.
Pulled in the entire series to dinq, thanks.
-Daniel
Quoted 29 lines
Signature · 28 lines
-- Damien Damien Lespiau (10): drm/i915: Specify when the PLL hw state fields are valid drm/i915: Add a space to the shared DPLL debug message drm/i915: Extract the HSW DDI selection code into its own function drm/i915: Extract the HSW/BDW shared dpll init code drm/i915: Restrict hsw_dp_set_ddi_pll_sel() to HSW/BDW drm/i915: Fix stale comment for intel_ddi_pll_select() drm/i915: Split the BDW/HSW specific shared pll selection drm/i915: Make intel_ddi_calculate_wrpll() HSW/BDW specific drm/i915: Split the CDCLK retrieval per-platform drm/i915: Make ddi_clock_gate() HSW/BDW specific drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/intel_ddi.c | 124 +++++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_display.c | 29 ++++---- drivers/gpu/drm/i915/intel_dp.c | 2 +- 4 files changed, 105 insertions(+), 53 deletions(-) -- 1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch