[Intel-gfx] [PATCH v3 15/15] drm/i915: s/dev_priv/i915/ for the remainder of DDI clock routing

[Lucas De Marchi]

On Fri, Feb 05, 2021 at 11:46:34PM +0200, Ville Syrjälä wrote:
>From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
>Convert the remaining 'dev_priv's to 'i915's in the DDI
>clock routing functions.
>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

when merging you may probably need to update this due to conflicts,
though.


Lucas De Marchi

>---
> drivers/gpu/drm/i915/display/intel_ddi.c | 38 ++++++++++++------------
> 1 file changed, 19 insertions(+), 19 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
>index d4b9410110fd..0f0e68c99589 100644
>--- a/drivers/gpu/drm/i915/display/intel_ddi.c
>+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
>@@ -1659,23 +1659,23 @@ static void rkl_ddi_disable_clock(struct intel_encoder *encoder)
> static void dg1_ddi_enable_clock(struct intel_encoder *encoder,
> 				 const struct intel_crtc_state *crtc_state)
> {
>-	struct drm_i915_private *dev_priv = 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;
>-	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
>+	enum phy phy = intel_port_to_phy(i915, encoder->port);
>
>-	if (drm_WARN_ON(&dev_priv->drm, !pll))
>+	if (drm_WARN_ON(&i915->drm, !pll))
> 		return;
>
> 	/*
> 	 * If we fail this, something went very wrong: first 2 PLLs should be
> 	 * used by first 2 phys and last 2 PLLs by last phys
> 	 */
>-	if (drm_WARN_ON(&dev_priv->drm,
>+	if (drm_WARN_ON(&i915->drm,
> 			(pll->info->id < DPLL_ID_DG1_DPLL2 && phy >= PHY_C) ||
> 			(pll->info->id >= DPLL_ID_DG1_DPLL2 && phy < PHY_C)))
> 		return;
>
>-	_cnl_ddi_enable_clock(dev_priv, DG1_DPCLKA_CFGCR0(phy),
>+	_cnl_ddi_enable_clock(i915, DG1_DPCLKA_CFGCR0(phy),
> 			      DG1_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy),
> 			      DG1_DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, phy),
> 			      DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy));
>@@ -1683,24 +1683,24 @@ static void dg1_ddi_enable_clock(struct intel_encoder *encoder,
>
> static void dg1_ddi_disable_clock(struct intel_encoder *encoder)
> {
>-	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>-	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
>+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
>+	enum phy phy = intel_port_to_phy(i915, encoder->port);
>
>-	_cnl_ddi_disable_clock(dev_priv, DG1_DPCLKA_CFGCR0(phy),
>+	_cnl_ddi_disable_clock(i915, DG1_DPCLKA_CFGCR0(phy),
> 			       DG1_DPCLKA_CFGCR0_DDI_CLK_OFF(phy));
> }
>
> static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder,
> 				       const struct intel_crtc_state *crtc_state)
> {
>-	struct drm_i915_private *dev_priv = 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;
>-	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
>+	enum phy phy = intel_port_to_phy(i915, encoder->port);
>
>-	if (drm_WARN_ON(&dev_priv->drm, !pll))
>+	if (drm_WARN_ON(&i915->drm, !pll))
> 		return;
>
>-	_cnl_ddi_enable_clock(dev_priv, ICL_DPCLKA_CFGCR0,
>+	_cnl_ddi_enable_clock(i915, ICL_DPCLKA_CFGCR0,
> 			      ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy),
> 			      ICL_DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, phy),
> 			      ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy));
>@@ -1708,10 +1708,10 @@ static void icl_ddi_combo_enable_clock(struct intel_encoder *encoder,
>
> static void icl_ddi_combo_disable_clock(struct intel_encoder *encoder)
> {
>-	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>-	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
>+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
>+	enum phy phy = intel_port_to_phy(i915, encoder->port);
>
>-	_cnl_ddi_disable_clock(dev_priv, ICL_DPCLKA_CFGCR0,
>+	_cnl_ddi_disable_clock(i915, ICL_DPCLKA_CFGCR0,
> 			       ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy));
> }
>
>@@ -1877,7 +1877,7 @@ static void intel_ddi_disable_clock(struct intel_encoder *encoder)
>
> void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder)
> {
>-	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> 	u32 port_mask;
> 	bool ddi_clk_needed;
>
>@@ -1897,7 +1897,7 @@ void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder)
> 		 * In the unlikely case that BIOS enables DP in MST mode, just
> 		 * warn since our MST HW readout is incomplete.
> 		 */
>-		if (drm_WARN_ON(&dev_priv->drm, is_mst))
>+		if (drm_WARN_ON(&i915->drm, is_mst))
> 			return;
> 	}
>
>@@ -1912,11 +1912,11 @@ void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder)
> 		 * Sanity check that we haven't incorrectly registered another
> 		 * encoder using any of the ports of this DSI encoder.
> 		 */
>-		for_each_intel_encoder(&dev_priv->drm, other_encoder) {
>+		for_each_intel_encoder(&i915->drm, other_encoder) {
> 			if (other_encoder == encoder)
> 				continue;
>
>-			if (drm_WARN_ON(&dev_priv->drm,
>+			if (drm_WARN_ON(&i915->drm,
> 					port_mask & BIT(other_encoder->port)))
> 				return;
> 		}
>-- 
>2.26.2
>