drm/i915: Fix dg1 buf trans tables

For some reason the dg1 buf trans tables have been stuffed into
icl_get_combo_buf_trans_edp() which doesn't even get called
on dg1. Split them out into a proper dg1 specific function,
and also make sure we use the proper buf trans tables for
DP as well as eDP.

v2: Add the hobl stuff

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210608073603.2408-13-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
index fcb67de..52bc6cb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
@@ -1325,12 +1325,6 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder,
        } else if (dev_priv->vbt.edp.low_vswing) {
                return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2,
                                           n_entries);
-       } else if (IS_DG1(dev_priv) && crtc_state->port_clock > 270000) {
-               return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3,
-                                          n_entries);
-       } else if (IS_DG1(dev_priv)) {
-               return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr,
-                                          n_entries);
        }
 
        return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries);
@@ -1546,6 +1540,53 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder,
 }
 
 static const struct intel_ddi_buf_trans *
+dg1_get_combo_buf_trans_dp(struct intel_encoder *encoder,
+                          const struct intel_crtc_state *crtc_state,
+                          int *n_entries)
+{
+       if (crtc_state->port_clock > 270000)
+               return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3,
+                                          n_entries);
+       else
+               return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr,
+                                          n_entries);
+}
+
+static const struct intel_ddi_buf_trans *
+dg1_get_combo_buf_trans_edp(struct intel_encoder *encoder,
+                           const struct intel_crtc_state *crtc_state,
+                           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 (crtc_state->port_clock > 540000)
+               return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3,
+                                          n_entries);
+       else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed)
+               return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl,
+                                          n_entries);
+       else if (dev_priv->vbt.edp.low_vswing)
+               return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2,
+                                          n_entries);
+       else
+               return dg1_get_combo_buf_trans_dp(encoder, crtc_state, n_entries);
+}
+
+static const struct intel_ddi_buf_trans *
+dg1_get_combo_buf_trans(struct intel_encoder *encoder,
+                       const struct intel_crtc_state *crtc_state,
+                       int *n_entries)
+{
+       if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
+               return icl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries);
+       else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP))
+               return dg1_get_combo_buf_trans_edp(encoder, crtc_state, n_entries);
+       else
+               return dg1_get_combo_buf_trans_dp(encoder, crtc_state, n_entries);
+}
+
+static const struct intel_ddi_buf_trans *
 rkl_get_combo_buf_trans_dp(struct intel_encoder *encoder,
                           const struct intel_crtc_state *crtc_state,
                           int *n_entries)
@@ -1682,6 +1723,8 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder)
                        encoder->get_buf_trans = adlp_get_dkl_buf_trans;
        } else if (IS_ROCKETLAKE(i915)) {
                encoder->get_buf_trans = rkl_get_combo_buf_trans;
+       } else if (IS_DG1(i915)) {
+               encoder->get_buf_trans = dg1_get_combo_buf_trans;
        } else if (DISPLAY_VER(i915) >= 12) {
                if (intel_phy_is_combo(i915, phy))
                        encoder->get_buf_trans = tgl_get_combo_buf_trans;