Commit 4669f5c2 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Split TGL 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-9-ville.syrjala@linux.intel.comReviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent ba30075d
...@@ -1157,49 +1157,64 @@ ehl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate, ...@@ -1157,49 +1157,64 @@ ehl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
} }
static const struct cnl_ddi_buf_trans * static const struct cnl_ddi_buf_trans *
tgl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate, tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, int type, int rate,
int *n_entries) 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); *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_hdmi);
return icl_combo_phy_ddi_translations_hdmi; return icl_combo_phy_ddi_translations_hdmi;
case INTEL_OUTPUT_EDP: }
if (dev_priv->vbt.edp.hobl) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
if (!intel_dp->hobl_failed && rate <= 540000) { static const struct cnl_ddi_buf_trans *
/* Same table applies to TGL, RKL and DG1 */ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, int type, int rate,
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_edp_hbr2_hobl); int *n_entries)
return tgl_combo_phy_ddi_translations_edp_hbr2_hobl; {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
if (rate > 270000) {
if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) {
*n_entries = ARRAY_SIZE(tgl_uy_combo_phy_ddi_translations_dp_hbr2);
return tgl_uy_combo_phy_ddi_translations_dp_hbr2;
} else {
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr2);
return tgl_combo_phy_ddi_translations_dp_hbr2;
} }
} else {
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr);
return tgl_combo_phy_ddi_translations_dp_hbr;
} }
}
static const struct cnl_ddi_buf_trans *
tgl_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);
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
if (rate > 540000) { if (rate > 540000) {
*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr3); *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr3);
return icl_combo_phy_ddi_translations_edp_hbr3; return icl_combo_phy_ddi_translations_edp_hbr3;
} else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) {
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_edp_hbr2_hobl);
return tgl_combo_phy_ddi_translations_edp_hbr2_hobl;
} else if (dev_priv->vbt.edp.low_vswing) { } else if (dev_priv->vbt.edp.low_vswing) {
*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2); *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2);
return icl_combo_phy_ddi_translations_edp_hbr2; return icl_combo_phy_ddi_translations_edp_hbr2;
} }
/* fall through */
default:
/* All combo DP and eDP ports that do not support low_vswing */
if (rate > 270000) {
if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) {
*n_entries = ARRAY_SIZE(tgl_uy_combo_phy_ddi_translations_dp_hbr2);
return tgl_uy_combo_phy_ddi_translations_dp_hbr2;
}
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr2); return tgl_get_combo_buf_trans_dp(encoder, type, rate, n_entries);
return tgl_combo_phy_ddi_translations_dp_hbr2; }
}
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr); static const struct cnl_ddi_buf_trans *
return tgl_combo_phy_ddi_translations_dp_hbr; tgl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
} int *n_entries)
{
if (type == INTEL_OUTPUT_HDMI)
return tgl_get_combo_buf_trans_hdmi(encoder, type, rate, n_entries);
else if (type == INTEL_OUTPUT_EDP)
return tgl_get_combo_buf_trans_edp(encoder, type, rate, n_entries);
else
return tgl_get_combo_buf_trans_dp(encoder, type, rate, n_entries);
} }
static const struct tgl_dkl_phy_ddi_buf_trans * static const struct tgl_dkl_phy_ddi_buf_trans *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment