Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daeaaef5 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/icl: remove intel_dpll_is_combophy() 



This is only used in intel_display() and shouldn't be needed there.
We don't want to keep converting from pll id to pll type so just remove
the function.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190309035727.25389-6-lucas.demarchi@intel.com
parent 2f3ee43c

drivers/gpu/drm/i915/intel_display.c

+0 −3
Original line number Diff line number Diff line
@@ -9616,9 +9616,6 @@ static void icelake_get_ddi_pll(struct drm_i915_private *dev_priv, 
		temp = I915_READ(DPCLKA_CFGCR0_ICL) &

		       DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port);

		id = temp >> DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port);



		if (WARN_ON(!intel_dpll_is_combophy(id)))

			return;

	} else if (intel_port_is_tc(dev_priv, port)) {

		id = icl_tc_port_to_pll_id(intel_port_to_tc(dev_priv, port));

	} else {

drivers/gpu/drm/i915/intel_dpll_mgr.c

+0 −5
Original line number Diff line number Diff line
@@ -2649,11 +2649,6 @@ enum intel_dpll_id icl_tc_port_to_pll_id(enum tc_port tc_port) 
	return tc_port + DPLL_ID_ICL_MGPLL1;

}



bool intel_dpll_is_combophy(enum intel_dpll_id id)

{

	return id == DPLL_ID_ICL_DPLL0 || id == DPLL_ID_ICL_DPLL1;

}



static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,

				     u32 *target_dco_khz,

				     struct intel_dpll_hw_state *state)