Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ffb1be7 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Rename s/i9xx/g4x/ in DP code 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456932138-14004-3-git-send-email-ville.syrjala@linux.intel.com
parent e7dc33f3

drivers/gpu/drm/i915/intel_dp.c

+7 −7
Original line number Diff line number Diff line
@@ -671,7 +671,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);
@@ -735,7 +735,7 @@ 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,

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)
@@ -5866,12 +5866,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;