drm/i915: Split ICL MG 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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200929233449.32323-7-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 5084368..b68b12f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1079,19 +1079,34 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
 }
 
 static const struct icl_mg_phy_ddi_buf_trans *
-icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate,
-                    int *n_entries)
+icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, int type, int rate,
+                         int *n_entries)
 {
-       if (type == INTEL_OUTPUT_HDMI) {
-               *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi);
-               return icl_mg_phy_ddi_translations_hdmi;
-       } else if (rate > 270000) {
+       *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi);
+       return icl_mg_phy_ddi_translations_hdmi;
+}
+
+static const struct icl_mg_phy_ddi_buf_trans *
+icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, int type, int rate,
+                       int *n_entries)
+{
+       if (rate > 270000) {
                *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hbr2_hbr3);
                return icl_mg_phy_ddi_translations_hbr2_hbr3;
+       } else {
+               *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr);
+               return icl_mg_phy_ddi_translations_rbr_hbr;
        }
+}
 
-       *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr);
-       return icl_mg_phy_ddi_translations_rbr_hbr;
+static const struct icl_mg_phy_ddi_buf_trans *
+icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate,
+                    int *n_entries)
+{
+       if (type == INTEL_OUTPUT_HDMI)
+               return icl_get_mg_buf_trans_hdmi(encoder, type, rate, n_entries);
+       else
+               return icl_get_mg_buf_trans_dp(encoder, type, rate, n_entries);
 }
 
 static const struct cnl_ddi_buf_trans *