On Fri, May 22, 2015 at 11:22:37AM +0300, Mika Kahola wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > ilk_get_aux_clock_divider() is now a subset of > hsw_get_aux_clock_divider() so unify them. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > v2: Rebased to the latest > v3: Rebased to the latest > > Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx> > > Author: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- Reviewed-by: Damien Lespiau <damien.lespiau@xxxxxxxxx> -- Damien > drivers/gpu/drm/i915/intel_dp.c | 23 +++-------------------- > 1 file changed, 3 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 2dd4d28..8d9c928 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -704,23 +704,6 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index) > struct drm_device *dev = intel_dig_port->base.base.dev; > struct drm_i915_private *dev_priv = dev->dev_private; > > - if (index) > - return 0; > - > - if (intel_dig_port->port == PORT_A) { > - return DIV_ROUND_UP(dev_priv->cdclk_freq, 2000); > - > - } else { > - return DIV_ROUND_UP(intel_pch_rawclk(dev), 2); > - } > -} > - > -static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index) > -{ > - struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); > - struct drm_device *dev = intel_dig_port->base.base.dev; > - struct drm_i915_private *dev_priv = dev->dev_private; > - > if (intel_dig_port->port == PORT_A) { > if (index) > return 0; > @@ -733,7 +716,9 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index) > default: return 0; > } > } else { > - return index ? 0 : DIV_ROUND_UP(intel_pch_rawclk(dev), 2); > + if (index) > + return 0; > + return DIV_ROUND_UP(intel_pch_rawclk(dev), 2); > } > } > > @@ -5731,8 +5716,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > intel_dp->get_aux_clock_divider = skl_get_aux_clock_divider; > else if (IS_VALLEYVIEW(dev)) > intel_dp->get_aux_clock_divider = vlv_get_aux_clock_divider; > - else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) > - intel_dp->get_aux_clock_divider = hsw_get_aux_clock_divider; > else if (HAS_PCH_SPLIT(dev)) > intel_dp->get_aux_clock_divider = ilk_get_aux_clock_divider; > else > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx