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

Commit 077973c8 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/icl: reduce pll_id scope and use enum type 



Now that pll_id is not used anymore for combophy, reduce its scope.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190322223751.22089-6-lucas.demarchi@intel.com


Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 02c99d26

drivers/gpu/drm/i915/intel_ddi.c

+3 −2
Original line number Diff line number Diff line
@@ -1456,12 +1456,13 @@ static void icl_ddi_clock_get(struct intel_encoder *encoder, 
	struct intel_dpll_hw_state *pll_state = &pipe_config->dpll_hw_state;

	enum port port = encoder->port;

	int link_clock;

	u32 pll_id;



	pll_id = intel_get_shared_dpll_id(dev_priv, pipe_config->shared_dpll);

	if (intel_port_is_combophy(dev_priv, port)) {

		link_clock = cnl_calc_wrpll_link(dev_priv, pll_state);

	} else {

		enum intel_dpll_id pll_id = intel_get_shared_dpll_id(dev_priv,

						pipe_config->shared_dpll);



		if (pll_id == DPLL_ID_ICL_TBTPLL)

			link_clock = icl_calc_tbt_pll_link(dev_priv, port);

		else