Commit 5f42196d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Replace intel_bios_is_lane_reversal_needed() with intel_bios_encoder_lane_reversal() 



The sole user of intel_bios_is_lane_reversal_needed() has
the devdata already located, so pass it in directly instead
of digging it again from vbt.ports[].

And rename the function to follow the common pattern for
these things.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230208015508.24824-5-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent db5d650f

drivers/gpu/drm/i915/display/intel_bios.c

+5 −16
Original line number Diff line number Diff line
@@ -3594,22 +3594,6 @@ intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915, 
	return devdata && devdata->child.hpd_invert;

}



/**

 * intel_bios_is_lane_reversal_needed - if lane reversal needed on port

 * @i915:       i915 device instance

 * @port:       port to check

 *

 * Return true if port requires lane reversal

 */

bool

intel_bios_is_lane_reversal_needed(const struct drm_i915_private *i915,

				   enum port port)

{

	const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];



	return devdata && devdata->child.lane_reversal;

}



enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,

				   enum port port)

{
@@ -3774,6 +3758,11 @@ bool intel_bios_encoder_supports_tbt(const struct intel_bios_encoder_data *devda 
	return devdata->i915->display.vbt.version >= 209 && devdata->child.tbt;

}



bool intel_bios_encoder_lane_reversal(const struct intel_bios_encoder_data *devdata)

{

	return devdata && devdata->child.lane_reversal;

}



const struct intel_bios_encoder_data *

intel_bios_encoder_data_lookup(struct drm_i915_private *i915, enum port port)

{

drivers/gpu/drm/i915/display/intel_bios.h

+1 −2
Original line number Diff line number Diff line
@@ -250,8 +250,6 @@ bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum por 
bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);

bool intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915,

				     enum port port);

bool intel_bios_is_lane_reversal_needed(const struct drm_i915_private *i915,

					enum port port);

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

bool intel_bios_get_dsc_params(struct intel_encoder *encoder,

			       struct intel_crtc_state *crtc_state,
@@ -275,5 +273,6 @@ bool intel_bios_encoder_supports_tbt(const struct intel_bios_encoder_data *devda 
bool intel_bios_encoder_is_lspcon(const struct intel_bios_encoder_data *devdata);

int intel_bios_encoder_dp_boost_level(const struct intel_bios_encoder_data *devdata);

int intel_bios_encoder_hdmi_boost_level(const struct intel_bios_encoder_data *devdata);

bool intel_bios_encoder_lane_reversal(const struct intel_bios_encoder_data *devdata);



#endif /* _INTEL_BIOS_H_ */

drivers/gpu/drm/i915/display/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -4500,7 +4500,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) 
			intel_de_read(dev_priv, DDI_BUF_CTL(port))

			& (DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);



	if (intel_bios_is_lane_reversal_needed(dev_priv, port))

	if (intel_bios_encoder_lane_reversal(devdata))

		dig_port->saved_port_bits |= DDI_BUF_PORT_REVERSAL;



	dig_port->dp.output_reg = INVALID_MMIO_REG;