drm/i915/icl: HPD pin for port F

Extend enum hpd_pin to port F so that we can start using this for ICL.

v2: Rebase.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180323172419.24911-6-paulo.r.zanoni@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 299b24045003420e5402bbe2eb0822086c381940..800230ba1c3b4ef014080925148acb64c3ecb71e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -262,6 +262,7 @@ enum hpd_pin {
        HPD_PORT_C,
        HPD_PORT_D,
        HPD_PORT_E,
+       HPD_PORT_F,
        HPD_NUM_PINS
 };
 

diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index 0e3d3e89d66a142e92a194f0affb1ddde1c63e31..43aa92beff2a691b8fe9ea0e00e1721680c73d2a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -100,6 +100,8 @@ enum port intel_hpd_pin_to_port(struct drm_i915_private *dev_priv,
                if (IS_CNL_WITH_PORT_F(dev_priv))
                        return PORT_F;
                return PORT_E;
+       case HPD_PORT_F:
+               return PORT_F;
        default:
                return PORT_NONE; /* no port for this pin */
        }
@@ -132,6 +134,7 @@ enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
        case PORT_F:
                if (IS_CNL_WITH_PORT_F(dev_priv))
                        return HPD_PORT_E;
+               return HPD_PORT_F;
        default:
                MISSING_CASE(port);
                return HPD_NONE;