On Mon, 30 Nov 2015, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > g4x is the first platform with DP support, so let's name the relevant > functions as g4x_ instead i9xx_ to avoid confusion. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_dp.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 2a9b5710ee83..06afcc101a2c 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -672,7 +672,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq) > return status; > } > > -static uint32_t i9xx_get_aux_clock_divider(struct intel_dp *intel_dp, int index) > +static uint32_t g4x_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_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev); > @@ -736,10 +736,10 @@ static uint32_t skl_get_aux_clock_divider(struct intel_dp *intel_dp, int index) > return index ? 0 : 1; > } > > -static uint32_t i9xx_get_aux_send_ctl(struct intel_dp *intel_dp, > - bool has_aux_irq, > - int send_bytes, > - uint32_t aux_clock_divider) > +static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp, > + bool has_aux_irq, > + int send_bytes, > + uint32_t aux_clock_divider) > { > struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); > struct drm_device *dev = intel_dig_port->base.base.dev; > @@ -5830,12 +5830,12 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > else if (HAS_PCH_SPLIT(dev)) > intel_dp->get_aux_clock_divider = ilk_get_aux_clock_divider; > else > - intel_dp->get_aux_clock_divider = i9xx_get_aux_clock_divider; > + intel_dp->get_aux_clock_divider = g4x_get_aux_clock_divider; > > if (INTEL_INFO(dev)->gen >= 9) > intel_dp->get_aux_send_ctl = skl_get_aux_send_ctl; > else > - intel_dp->get_aux_send_ctl = i9xx_get_aux_send_ctl; > + intel_dp->get_aux_send_ctl = g4x_get_aux_send_ctl; > > if (HAS_DDI(dev)) > intel_dp->prepare_link_retrain = intel_ddi_prepare_link_retrain; -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx