Re: [PATCH 05/29] drm/i915: Extract intel_ddi_clk_disable()

Chris Wilson
2017-09-18T18:45:18Z

Quoting Ville Syrjala (2017-09-18 19:25:40)
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Pull the code to disable the port clock into a function. We already have
> the intel_ddi_clk_select() counterpart.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 93cbbcbbc193..2b4de7d03ff0 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2131,6 +2131,21 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,
> }
> }
>
> +static void intel_ddi_clk_disable(struct intel_encoder *encoder)
> +{
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> + enum port port = encoder->port;

port was previously intel_ddi_get_encoder_port(encoder).

> +
> + if (IS_CANNONLAKE(dev_priv))
> + I915_WRITE(DPCLKA_CFGCR0, I915_READ(DPCLKA_CFGCR0) |
> + DPCLKA_CFGCR0_DDI_CLK_OFF(port));
> + else if (IS_GEN9_BC(dev_priv))
> + I915_WRITE(DPLL_CTRL2, I915_READ(DPLL_CTRL2) |
> + DPLL_CTRL2_DDI_CLK_OFF(port));
> + else if (INTEL_GEN(dev_priv) < 9)
> + I915_WRITE(PORT_CLK_SEL(port), PORT_CLK_SEL_NONE);
> +}