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

drm/i915: Split EHL combo PHY buf trans per output type 



Make the mess inside the buf trans funcs a bit more manageable by
splitting along the lines of output type.

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


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent 5ee3e1da

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

+39 −20
Original line number Diff line number Diff line
@@ -1110,16 +1110,27 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate, 
}



static const struct cnl_ddi_buf_trans *

ehl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,

ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, int type, int rate,

			     int *n_entries)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	switch (type) {

	case INTEL_OUTPUT_HDMI:

	*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_hdmi);

	return icl_combo_phy_ddi_translations_hdmi;

	case INTEL_OUTPUT_EDP:

}



static const struct cnl_ddi_buf_trans *

ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, int type, int rate,

			   int *n_entries)

{

	*n_entries = ARRAY_SIZE(ehl_combo_phy_ddi_translations_dp);

	return ehl_combo_phy_ddi_translations_dp;

}



static const struct cnl_ddi_buf_trans *

ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, int type, int rate,

			    int *n_entries)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	if (dev_priv->vbt.edp.low_vswing) {

		if (rate > 540000) {

			*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr3);
@@ -1129,12 +1140,20 @@ ehl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate, 
			return icl_combo_phy_ddi_translations_edp_hbr2;

		}

	}

		/* fall through */

	default:

		/* All combo DP and eDP ports that do not support low_vswing */

		*n_entries = ARRAY_SIZE(ehl_combo_phy_ddi_translations_dp);

		return ehl_combo_phy_ddi_translations_dp;



	return ehl_get_combo_buf_trans_dp(encoder, type, rate, n_entries);

}



static const struct cnl_ddi_buf_trans *

ehl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,

			int *n_entries)

{

	if (type == INTEL_OUTPUT_HDMI)

		return ehl_get_combo_buf_trans_hdmi(encoder, type, rate, n_entries);

	else if (type == INTEL_OUTPUT_EDP)

		return ehl_get_combo_buf_trans_edp(encoder, type, rate, n_entries);

	else

		return ehl_get_combo_buf_trans_dp(encoder, type, rate, n_entries);

}



static const struct cnl_ddi_buf_trans *