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

drm/i915: Pass devdata to intel_bios_port_aux_ch() 



Currently intel_bios_port_aux_ch() digs out the devdata
(VBT child device info) from the vbt.ports[] array. We
need to get rid of that, so just pass in the correct
encoder->devdata (now that we have it also for g4x+ ports)
directly.

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


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

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

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

		intel_infoframe_init(dig_port);



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

	dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, devdata, port);

	if (!intel_dp_init_connector(dig_port, intel_connector))

		goto err_init_connector;

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

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


	intel_infoframe_init(dig_port);



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

	dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, devdata, port);

	intel_hdmi_init_connector(dig_port, intel_connector);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -3575,9 +3575,9 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder, 
}



enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,

				   const struct intel_bios_encoder_data *devdata,

				   enum port port)

{

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

	enum aux_ch aux_ch;



	if (!devdata || !devdata->child.aux_channel) {

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

+3 −1
Original line number Diff line number Diff line
@@ -248,7 +248,9 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por 
bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);

bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port);

bool intel_bios_is_dsi_present(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);

enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,

				   const struct intel_bios_encoder_data *devdata,

				   enum port port);

bool intel_bios_get_dsc_params(struct intel_encoder *encoder,

			       struct intel_crtc_state *crtc_state,

			       int dsc_max_bpc);

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

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


	dig_port->dp.output_reg = INVALID_MMIO_REG;

	dig_port->max_lanes = intel_ddi_max_lanes(dig_port);

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

	dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, devdata, port);



	if (intel_phy_is_tc(dev_priv, phy)) {

		bool is_legacy =