Commit 6cbcd576 authored by Imre Deak's avatar Imre Deak

drm/i915/hsw: Use the DPLL ID when calculating DPLL clock

Instead of converting DPLL ID to CLK_SEL to identify the DPLL use the
DPLL ID directly for this.
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226203455.23032-6-imre.deak@intel.com
parent 4ac7df17
...@@ -1729,26 +1729,25 @@ static void hsw_ddi_clock_get(struct intel_encoder *encoder, ...@@ -1729,26 +1729,25 @@ static void hsw_ddi_clock_get(struct intel_encoder *encoder,
{ {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
int link_clock = 0; int link_clock = 0;
u32 val, pll; u32 pll;
val = hsw_pll_to_ddi_pll_sel(pipe_config->shared_dpll); switch (pipe_config->shared_dpll->info->id) {
switch (val & PORT_CLK_SEL_MASK) { case DPLL_ID_LCPLL_810:
case PORT_CLK_SEL_LCPLL_810:
link_clock = 81000; link_clock = 81000;
break; break;
case PORT_CLK_SEL_LCPLL_1350: case DPLL_ID_LCPLL_1350:
link_clock = 135000; link_clock = 135000;
break; break;
case PORT_CLK_SEL_LCPLL_2700: case DPLL_ID_LCPLL_2700:
link_clock = 270000; link_clock = 270000;
break; break;
case PORT_CLK_SEL_WRPLL1: case DPLL_ID_WRPLL1:
link_clock = hsw_ddi_calc_wrpll_link(dev_priv, WRPLL_CTL(0)); link_clock = hsw_ddi_calc_wrpll_link(dev_priv, WRPLL_CTL(0));
break; break;
case PORT_CLK_SEL_WRPLL2: case DPLL_ID_WRPLL2:
link_clock = hsw_ddi_calc_wrpll_link(dev_priv, WRPLL_CTL(1)); link_clock = hsw_ddi_calc_wrpll_link(dev_priv, WRPLL_CTL(1));
break; break;
case PORT_CLK_SEL_SPLL: case DPLL_ID_SPLL:
pll = intel_de_read(dev_priv, SPLL_CTL) & SPLL_FREQ_MASK; pll = intel_de_read(dev_priv, SPLL_CTL) & SPLL_FREQ_MASK;
if (pll == SPLL_FREQ_810MHz) if (pll == SPLL_FREQ_810MHz)
link_clock = 81000; link_clock = 81000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment