1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index 875d5d218d5c..fe28c1ea84a5 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -78,12 +78,14 @@
 
 /**
  * intel_hpd_port - return port hard associated with certain pin.
+ * @dev_priv: private driver data pointer
  * @pin: the hpd pin to get associated port
  *
  * Return port that is associatade with @pin and PORT_NONE if no port is
  * hard associated with that @pin.
  */
-enum port intel_hpd_pin_to_port(enum hpd_pin pin)
+enum port intel_hpd_pin_to_port(struct drm_i915_private *dev_priv,
+                                enum hpd_pin pin)
 {
         switch (pin) {
         case HPD_PORT_A:
@@ -95,6 +97,8 @@ enum port intel_hpd_pin_to_port(enum hpd_pin pin)
         case HPD_PORT_D:
                 return PORT_D;
         case HPD_PORT_E:
+                if (IS_CNL_WITH_PORT_F(dev_priv))
+                        return PORT_F;
                 return PORT_E;
         default:
                 return PORT_NONE; /* no port for this pin */
@@ -102,13 +106,17 @@ enum port intel_hpd_pin_to_port(enum hpd_pin pin)
 }
 
 /**
- * intel_hpd_pin - return pin hard associated with certain port.
+ * intel_hpd_pin_default - return default pin associated with certain port.
+ * @dev_priv: private driver data pointer
  * @port: the hpd port to get associated pin
  *
+ * It is only valid and used by digital port encoder.
+ *
  * Return pin that is associatade with @port and HDP_NONE if no pin is
  * hard associated with that @port.
  */
-enum hpd_pin intel_hpd_pin(enum port port)
+enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
+                                   enum port port)
 {
         switch (port) {
         case PORT_A:
@@ -121,6 +129,9 @@ enum hpd_pin intel_hpd_pin(enum port port)
                 return HPD_PORT_D;
         case PORT_E:
                 return HPD_PORT_E;
+        case PORT_F:
+                if (IS_CNL_WITH_PORT_F(dev_priv))
+                        return HPD_PORT_E;
         default:
                 MISSING_CASE(port);
                 return HPD_NONE;
@@ -417,7 +428,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
                 if (!(BIT(i) & pin_mask))
                         continue;
 
-                port = intel_hpd_pin_to_port(i);
+                port = intel_hpd_pin_to_port(dev_priv, i);
                 is_dig_port = port != PORT_NONE &&
                         dev_priv->hotplug.irq_port[port];