drm/i915/icl: use combophy/TC helper functions during display detection

Instead of directly comparing HPD pins use intel_port_is_combophy/tc
helper functions to distinguish between combophy/TC ports.

Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181003072203.12848-3-mahesh1.kumar@intel.com

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7f91b28..1f098e5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5003,19 +5003,14 @@ static bool icl_digital_port_connected(struct intel_encoder *encoder)
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
        struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
 
-       switch (encoder->hpd_pin) {
-       case HPD_PORT_A:
-       case HPD_PORT_B:
+       if (intel_port_is_combophy(dev_priv, encoder->port))
                return icl_combo_port_connected(dev_priv, dig_port);
-       case HPD_PORT_C:
-       case HPD_PORT_D:
-       case HPD_PORT_E:
-       case HPD_PORT_F:
+       else if (intel_port_is_tc(dev_priv, encoder->port))
                return icl_tc_port_connected(dev_priv, dig_port);
-       default:
+       else
                MISSING_CASE(encoder->hpd_pin);
-               return false;
-       }
+
+       return false;
 }
 
 /*