[Intel-gfx] [PATCH 01/23] drm/i915/icl: Add support to read out the TBT PLL HW state

Souza, Jose jose.souza at intel.com
Fri Jun 7 17:36:16 UTC 2019


On Tue, 2019-06-04 at 17:58 +0300, Imre Deak wrote:
> Add support to read out the TBT PLL HW state.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> Cc: Vandita Kulkarni <vandita.kulkarni at intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index fc47ed0247c5..26474788b7b2 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9859,13 +9859,20 @@ static void icelake_get_ddi_pll(struct
> drm_i915_private *dev_priv,
>  	enum intel_dpll_id id;
>  	u32 temp;
>  
> -	/* TODO: TBT pll not implemented. */
>  	if (intel_port_is_combophy(dev_priv, port)) {
>  		temp = I915_READ(DPCLKA_CFGCR0_ICL) &
>  		       DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port);
>  		id = temp >> DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port);
>  	} else if (intel_port_is_tc(dev_priv, port)) {
> -		id = icl_tc_port_to_pll_id(intel_port_to_tc(dev_priv,
> port));
> +		u32 clk_sel = I915_READ(DDI_CLK_SEL(port)) &
> DDI_CLK_SEL_MASK;
> +
> +		if (clk_sel == DDI_CLK_SEL_MG) {
> +			id =
> icl_tc_port_to_pll_id(intel_port_to_tc(dev_priv,
> +								    por
> t));
> +		} else {
> +			WARN_ON(clk_sel < DDI_CLK_SEL_TBT_162);
> +			id = DPLL_ID_ICL_TBTPLL;
> +		}
>  	} else {
>  		WARN(1, "Invalid port %x\n", port);
>  		return;


More information about the Intel-gfx mailing list