drm/i915/tgl: Add additional PHYs for Tiger Lake

Tiger Lake has up to 3 combo phys and 6 TC phys. Extend the helper
conversion functions from port to phy.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190711173115.28296-14-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 13ff4177bebaf5f7c3c9f63a5c6fc3c38bd630c8..60459b9d1ec58dee175fe619578824b39456b630 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6676,7 +6676,7 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)
        if (phy == PHY_NONE)
                return false;
 
-       if (IS_ELKHARTLAKE(dev_priv))
+       if (IS_ELKHARTLAKE(dev_priv) || INTEL_GEN(dev_priv) >= 12)
                return phy <= PHY_C;
 
        if (INTEL_GEN(dev_priv) >= 11)
@@ -6687,6 +6687,9 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)
 
 bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy)
 {
+       if (INTEL_GEN(dev_priv) >= 12)
+               return phy >= PHY_D && phy <= PHY_I;
+
        if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
                return phy >= PHY_C && phy <= PHY_F;
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 72ce27079a56a33a80286f1bf3d5d8aa15e1185e..92931dc26470a75d5018d01aac6054240d20e9ed 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -249,6 +249,9 @@ enum phy {
        PHY_D,
        PHY_E,
        PHY_F,
+       PHY_G,
+       PHY_H,
+       PHY_I,
 
        I915_MAX_PHYS
 };