Commit 39053089 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch() 



Conform to function naming in intel_bios.c.

Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181115105237.1237-1-jani.nikula@intel.com
parent fc366053

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -3455,7 +3455,7 @@ bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv, 
				     enum port port);

bool intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,

				enum port port);

enum aux_ch intel_aux_ch(struct drm_i915_private *dev_priv, enum port port);

enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port port);



/* intel_acpi.c */

#ifdef CONFIG_ACPI

drivers/gpu/drm/i915/intel_bios.c

+2 −1
Original line number Diff line number Diff line
@@ -2191,7 +2191,8 @@ intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv, 
	return false;

}



enum aux_ch intel_aux_ch(struct drm_i915_private *dev_priv, enum port port)

enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,

				   enum port port)

{

	const struct ddi_vbt_port_info *info =

		&dev_priv->vbt.ddi_port_info[port];

drivers/gpu/drm/i915/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -4119,7 +4119,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 
			(DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);

	intel_dig_port->dp.output_reg = INVALID_MMIO_REG;

	intel_dig_port->max_lanes = intel_ddi_max_lanes(intel_dig_port);

	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);

	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);



	switch (port) {

	case PORT_A:

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -6745,7 +6745,7 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, 
	if (port != PORT_A)

		intel_infoframe_init(intel_dig_port);



	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);

	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);

	if (!intel_dp_init_connector(intel_dig_port, intel_connector))

		goto err_init_connector;

drivers/gpu/drm/i915/intel_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2519,6 +2519,6 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv, 


	intel_infoframe_init(intel_dig_port);



	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);

	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);

	intel_hdmi_init_connector(intel_dig_port, intel_connector);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE