Skip to content

Commit daeaaef

Browse files
committed
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: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190309035727.25389-6-lucas.demarchi@intel.com
1 parent 2f3ee43 commit daeaaef

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

drivers/gpu/drm/i915/intel_display.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9616,9 +9616,6 @@ static void icelake_get_ddi_pll(struct drm_i915_private *dev_priv,
96169616
temp = I915_READ(DPCLKA_CFGCR0_ICL) &
96179617
DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port);
96189618
id = temp >> DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port);
9619-
9620-
if (WARN_ON(!intel_dpll_is_combophy(id)))
9621-
return;
96229619
} else if (intel_port_is_tc(dev_priv, port)) {
96239620
id = icl_tc_port_to_pll_id(intel_port_to_tc(dev_priv, port));
96249621
} else {

drivers/gpu/drm/i915/intel_dpll_mgr.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2649,11 +2649,6 @@ enum intel_dpll_id icl_tc_port_to_pll_id(enum tc_port tc_port)
26492649
return tc_port + DPLL_ID_ICL_MGPLL1;
26502650
}
26512651

2652-
bool intel_dpll_is_combophy(enum intel_dpll_id id)
2653-
{
2654-
return id == DPLL_ID_ICL_DPLL0 || id == DPLL_ID_ICL_DPLL1;
2655-
}
2656-
26572652
static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,
26582653
u32 *target_dco_khz,
26592654
struct intel_dpll_hw_state *state)

0 commit comments

Comments
 (0)