From: Lucas De Marchi Date: Fri, 22 Mar 2019 22:37:51 +0000 (-0700) Subject: drm/i915/icl: reduce pll_id scope and use enum type X-Git-Tag: v5.4-rc1~498^2~29^2~380 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=077973c8c37fff683b607f7d0966db1eee47fb4f;p=platform%2Fkernel%2Flinux-rpi.git 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: Lucas De Marchi Link: https://patchwork.freedesktop.org/patch/msgid/20190322223751.22089-6-lucas.demarchi@intel.com Reviewed-by: Ville Syrjälä --- diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 6300523..ba3de10 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -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