Skip to content

L
linux
Commit 7815ed88 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files
Options

drm/i915: Use intel_de_rmw() for DDI clock routing 

The DDI clock routing programming is riddled with shared
registers, forcing us to do a lot of RMW. Switch over to
intel_de_rmw() to make that a bit less obnoxious.
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210205214634.19341-9-ville.syrjala@linux.intel.com
parent 36ecb0ec
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 49 deletions
drivers/gpu/drm/i915/display/intel_ddi.c
View file @ 7815ed88
...@@ -1605,7 +1605,6 @@ static void dg1_ddi_enable_clock(struct intel_encoder *encoder, ...@@ -1605,7 +1605,6 @@ static void dg1_ddi_enable_clock(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);
struct intel_shared_dpll *pll = crtc_state->shared_dpll; struct intel_shared_dpll *pll = crtc_state->shared_dpll;
enum phy phy = intel_port_to_phy(dev_priv, encoder->port); enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
u32 val;
/* /*
* If we fail this, something went very wrong: first 2 PLLs should be * If we fail this, something went very wrong: first 2 PLLs should be
...@@ -1618,17 +1617,12 @@ static void dg1_ddi_enable_clock(struct intel_encoder *encoder, ...@@ -1618,17 +1617,12 @@ static void dg1_ddi_enable_clock(struct intel_encoder *encoder,
mutex_lock(&dev_priv->dpll.lock); mutex_lock(&dev_priv->dpll.lock);
val = intel_de_read(dev_priv, DG1_DPCLKA_CFGCR0(phy)); intel_de_rmw(dev_priv, DG1_DPCLKA_CFGCR0(phy),
drm_WARN_ON(&dev_priv->drm, DG1_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy),
(val & DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)) == 0); DG1_DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, phy));
val &= ~DG1_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy);
val |= DG1_DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, phy);
intel_de_write(dev_priv, DG1_DPCLKA_CFGCR0(phy), val);
intel_de_posting_read(dev_priv, DG1_DPCLKA_CFGCR0(phy));
val &= ~DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy); intel_de_rmw(dev_priv, DG1_DPCLKA_CFGCR0(phy),
intel_de_write(dev_priv, DG1_DPCLKA_CFGCR0(phy), val); DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy), 0);
mutex_unlock(&dev_priv->dpll.lock); mutex_unlock(&dev_priv->dpll.lock);
} }
...@@ -1640,8 +1634,8 @@ static void dg1_ddi_disable_clock(struct intel_encoder *encoder) ...@@ -1640,8 +1634,8 @@ static void dg1_ddi_disable_clock(struct intel_encoder *encoder)
mutex_lock(&dev_priv->dpll.lock); mutex_lock(&dev_priv->dpll.lock);
intel_de_rmw(dev_priv, DG1_DPCLKA_CFGCR0(phy), 0, intel_de_rmw(dev_priv, DG1_DPCLKA_CFGCR0(phy),
DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy)); 0, DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy));
mutex_unlock(&dev_priv->dpll.lock); mutex_unlock(&dev_priv->dpll.lock);
} }
...@@ -1652,7 +1646,7 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder, ...@@ -1652,7 +1646,7 @@ static void icl_ddi_combo_enable_clock(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);
struct intel_shared_dpll *pll = crtc_state->shared_dpll; struct intel_shared_dpll *pll = crtc_state->shared_dpll;
enum phy phy = intel_port_to_phy(dev_priv, encoder->port); enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
u32 val, mask, sel; u32 mask, sel;
i915_reg_t reg; i915_reg_t reg;
if (IS_ALDERLAKE_S(dev_priv)) { if (IS_ALDERLAKE_S(dev_priv)) {
...@@ -1671,10 +1665,6 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder, ...@@ -1671,10 +1665,6 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder,
mutex_lock(&dev_priv->dpll.lock); mutex_lock(&dev_priv->dpll.lock);
val = intel_de_read(dev_priv, reg);
drm_WARN_ON(&dev_priv->drm,
(val & icl_dpclka_cfgcr0_clk_off(dev_priv, phy)) == 0);
/* /*
* Even though this register references DDIs, note that we * Even though this register references DDIs, note that we
* want to pass the PHY rather than the port (DDI). For * want to pass the PHY rather than the port (DDI). For
...@@ -1685,13 +1675,10 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder, ...@@ -1685,13 +1675,10 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder,
* Clock Select chooses the PLL for both DDIA and DDID and * Clock Select chooses the PLL for both DDIA and DDID and
* drives port A in all cases." * drives port A in all cases."
*/ */
val &= ~mask; intel_de_rmw(dev_priv, reg, mask, sel);
val |= sel;
intel_de_write(dev_priv, reg, val);
intel_de_posting_read(dev_priv, reg);
val &= ~icl_dpclka_cfgcr0_clk_off(dev_priv, phy); intel_de_rmw(dev_priv, reg,
intel_de_write(dev_priv, reg, val); icl_dpclka_cfgcr0_clk_off(dev_priv, phy), 0);
mutex_unlock(&dev_priv->dpll.lock); mutex_unlock(&dev_priv->dpll.lock);
} }
...@@ -1700,7 +1687,6 @@ static void icl_ddi_combo_disable_clock(struct intel_encoder *encoder) ...@@ -1700,7 +1687,6 @@ static void icl_ddi_combo_disable_clock(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);
enum phy phy = intel_port_to_phy(dev_priv, encoder->port); enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
u32 val;
i915_reg_t reg; i915_reg_t reg;
mutex_lock(&dev_priv->dpll.lock); mutex_lock(&dev_priv->dpll.lock);
...@@ -1710,10 +1696,10 @@ static void icl_ddi_combo_disable_clock(struct intel_encoder *encoder) ...@@ -1710,10 +1696,10 @@ static void icl_ddi_combo_disable_clock(struct intel_encoder *encoder)
else else
reg = ICL_DPCLKA_CFGCR0; reg = ICL_DPCLKA_CFGCR0;
val = intel_de_read(dev_priv, reg); mutex_lock(&dev_priv->dpll.lock);
val |= icl_dpclka_cfgcr0_clk_off(dev_priv, phy);
intel_de_write(dev_priv, reg, val); intel_de_rmw(dev_priv, reg,
0, icl_dpclka_cfgcr0_clk_off(dev_priv, phy));
mutex_unlock(&dev_priv->dpll.lock); mutex_unlock(&dev_priv->dpll.lock);
} }
...@@ -1918,25 +1904,22 @@ static void cnl_ddi_enable_clock(struct intel_encoder *encoder, ...@@ -1918,25 +1904,22 @@ static void cnl_ddi_enable_clock(struct intel_encoder *encoder,
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
const struct intel_shared_dpll *pll = crtc_state->shared_dpll; const struct intel_shared_dpll *pll = crtc_state->shared_dpll;
enum port port = encoder->port; enum port port = encoder->port;
u32 val;
if (drm_WARN_ON(&i915->drm, !pll)) if (drm_WARN_ON(&i915->drm, !pll))
return; return;
mutex_lock(&i915->dpll.lock); mutex_lock(&i915->dpll.lock);
val = intel_de_read(i915, DPCLKA_CFGCR0); intel_de_rmw(i915, DPCLKA_CFGCR0,
val &= ~DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port); DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port),
val |= DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, port); DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, port));
intel_de_write(i915, DPCLKA_CFGCR0, val);
/* /*
* "This step and the step before must be * "This step and the step before must be
* done with separate register writes." * done with separate register writes."
*/ */
val = intel_de_read(i915, DPCLKA_CFGCR0); intel_de_rmw(i915, DPCLKA_CFGCR0,
val &= ~DPCLKA_CFGCR0_DDI_CLK_OFF(port); DPCLKA_CFGCR0_DDI_CLK_OFF(port), 0);
intel_de_write(i915, DPCLKA_CFGCR0, val);
mutex_unlock(&i915->dpll.lock); mutex_unlock(&i915->dpll.lock);
} }
...@@ -1946,8 +1929,8 @@ static void cnl_ddi_disable_clock(struct intel_encoder *encoder) ...@@ -1946,8 +1929,8 @@ static void cnl_ddi_disable_clock(struct intel_encoder *encoder)
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
enum port port = encoder->port; enum port port = encoder->port;
intel_de_write(i915, DPCLKA_CFGCR0, intel_de_rmw(i915, DPCLKA_CFGCR0,
intel_de_read(i915, DPCLKA_CFGCR0) | DPCLKA_CFGCR0_DDI_CLK_OFF(port)); 0, DPCLKA_CFGCR0_DDI_CLK_OFF(port));
} }
static void skl_ddi_enable_clock(struct intel_encoder *encoder, static void skl_ddi_enable_clock(struct intel_encoder *encoder,
...@@ -1956,22 +1939,18 @@ static void skl_ddi_enable_clock(struct intel_encoder *encoder, ...@@ -1956,22 +1939,18 @@ static void skl_ddi_enable_clock(struct intel_encoder *encoder,
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
const struct intel_shared_dpll *pll = crtc_state->shared_dpll; const struct intel_shared_dpll *pll = crtc_state->shared_dpll;
enum port port = encoder->port; enum port port = encoder->port;
u32 val;
if (drm_WARN_ON(&i915->drm, !pll)) if (drm_WARN_ON(&i915->drm, !pll))
return; return;
mutex_lock(&i915->dpll.lock); mutex_lock(&i915->dpll.lock);
val = intel_de_read(i915, DPLL_CTRL2); intel_de_rmw(i915, DPLL_CTRL2,
DPLL_CTRL2_DDI_CLK_OFF(port) |
val &= ~(DPLL_CTRL2_DDI_CLK_OFF(port) | DPLL_CTRL2_DDI_CLK_SEL_MASK(port),
DPLL_CTRL2_DDI_CLK_SEL_MASK(port)); DPLL_CTRL2_DDI_CLK_SEL(pll->info->id, port) |
val |= (DPLL_CTRL2_DDI_CLK_SEL(pll->info->id, port) |
DPLL_CTRL2_DDI_SEL_OVERRIDE(port)); DPLL_CTRL2_DDI_SEL_OVERRIDE(port));
intel_de_write(i915, DPLL_CTRL2, val);
mutex_unlock(&i915->dpll.lock); mutex_unlock(&i915->dpll.lock);
} }
...@@ -1980,8 +1959,8 @@ static void skl_ddi_disable_clock(struct intel_encoder *encoder) ...@@ -1980,8 +1959,8 @@ static void skl_ddi_disable_clock(struct intel_encoder *encoder)
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
enum port port = encoder->port; enum port port = encoder->port;
intel_de_write(i915, DPLL_CTRL2, intel_de_rmw(i915, DPLL_CTRL2,
intel_de_read(i915, DPLL_CTRL2) | DPLL_CTRL2_DDI_CLK_OFF(port)); 0, DPLL_CTRL2_DDI_CLK_OFF(port));
} }
void hsw_ddi_enable_clock(struct intel_encoder *encoder, void hsw_ddi_enable_clock(struct intel_encoder *encoder,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7