diff options
| author |   Lucas De Marchi <lucas.demarchi@intel.com> | 2019-03-22 15:37:51 -0700 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2019-03-26 09:30:12 -0700 |
| commit | 077973c8c37fff683b607f7d0966db1eee47fb4f (patch) | |
| tree | 67330c43fb5a007c85265030e1dad2ffd75d3862 /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | drm/i915/icl: use previous pll hw readout (diff) | |
| download | linux-dev-077973c8c37fff683b607f7d0966db1eee47fb4f.tar.xz linux-dev-077973c8c37fff683b607f7d0966db1eee47fb4f.zip | |
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 <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190322223751.22089-6-lucas.demarchi@intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 63005239d092..ba3de1079e63 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 |