[Intel-gfx] [PATCH 18/29] drm/i915: Pass encoder type to cnl_ddi_vswing_sequence() explicitly

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

encoder->type is unreliable for DP/HDMI, so pass it in explicity into
cnl_ddi_vswing_sequence(). This matches what we do for BXT.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 43 ++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 406c76fe830a..dc32dfa23d07 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1914,16 +1914,15 @@ static void cnl_ddi_vswing_program(struct 
drm_i915_private *dev_priv,
                                    u32 level, enum port port, int type)
 {
        const struct cnl_ddi_buf_trans *ddi_translations = NULL;
-       u32 n_entries, val;
-       int ln;
+       int n_entries, ln;
+       u32 val;
 
-       if (type == INTEL_OUTPUT_HDMI) {
+       if (type == INTEL_OUTPUT_HDMI)
                ddi_translations = cnl_get_buf_trans_hdmi(dev_priv, &n_entries);
-       } else if (type == INTEL_OUTPUT_DP) {
-               ddi_translations = cnl_get_buf_trans_dp(dev_priv, &n_entries);
-       } else if (type == INTEL_OUTPUT_EDP) {
+       else if (type == INTEL_OUTPUT_EDP)
                ddi_translations = cnl_get_buf_trans_edp(dev_priv, &n_entries);
-       }
+       else
+               ddi_translations = cnl_get_buf_trans_dp(dev_priv, &n_entries);
 
        if (WARN_ON(ddi_translations == NULL))
                return;
@@ -1976,26 +1975,22 @@ static void cnl_ddi_vswing_program(struct 
drm_i915_private *dev_priv,
        I915_WRITE(CNL_PORT_TX_DW7_GRP(port), val);
 }
 
-static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder, u32 level)
+static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder,
+                                   int level, int type)
 {
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-       struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
        enum port port = intel_ddi_get_encoder_port(encoder);
-       int type = encoder->type;
-       int width = 0;
-       int rate = 0;
+       int width, rate, ln;
        u32 val;
-       int ln = 0;
 
-       if ((intel_dp) && (type == INTEL_OUTPUT_EDP || type == 
INTEL_OUTPUT_DP)) {
-               width = intel_dp->lane_count;
-               rate = intel_dp->link_rate;
-       } else if (type == INTEL_OUTPUT_HDMI) {
+       if (type == INTEL_OUTPUT_HDMI) {
                width = 4;
-               /* Rate is always < than 6GHz for HDMI */
+               rate = 0; /* Rate is always < than 6GHz for HDMI */
        } else {
-               MISSING_CASE(type);
-               return;
+               struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+
+               width = intel_dp->lane_count;
+               rate = intel_dp->link_rate;
        }
 
        /*
@@ -2004,7 +1999,7 @@ static void cnl_ddi_vswing_sequence(struct intel_encoder 
*encoder, u32 level)
         * else clear to 0b.
         */
        val = I915_READ(CNL_PORT_PCS_DW1_LN0(port));
-       if (type == INTEL_OUTPUT_EDP || type == INTEL_OUTPUT_DP)
+       if (type != INTEL_OUTPUT_HDMI)
                val |= COMMON_KEEPER_EN;
        else
                val &= ~COMMON_KEEPER_EN;
@@ -2079,7 +2074,7 @@ u32 bxt_signal_levels(struct intel_dp *intel_dp)
        u32 level = intel_ddi_dp_level(intel_dp);
 
        if (IS_CANNONLAKE(dev_priv))
-               cnl_ddi_vswing_sequence(encoder, level);
+               cnl_ddi_vswing_sequence(encoder, level, encoder->type);
        else
                bxt_ddi_vswing_sequence(encoder, level, encoder->type);
 
@@ -2178,7 +2173,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder 
*encoder,
        intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
 
        if (IS_CANNONLAKE(dev_priv))
-               cnl_ddi_vswing_sequence(encoder, level);
+               cnl_ddi_vswing_sequence(encoder, level, encoder->type);
        else if (IS_GEN9_LP(dev_priv))
                bxt_ddi_vswing_sequence(encoder, level, encoder->type);
        else
@@ -2208,7 +2203,7 @@ static void intel_ddi_pre_enable_hdmi(struct 
intel_encoder *encoder,
        intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
 
        if (IS_CANNONLAKE(dev_priv))
-               cnl_ddi_vswing_sequence(encoder, level);
+               cnl_ddi_vswing_sequence(encoder, level, INTEL_OUTPUT_HDMI);
        else if (IS_GEN9_LP(dev_priv))
                bxt_ddi_vswing_sequence(encoder, level, INTEL_OUTPUT_HDMI);
        else
-- 
2.13.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx