drm/i915/rkl: Setup ports/phys

RKL uses DDI's A, B, TC1, and TC2 which need to map to combo PHY's A-D.

Bspec: 49181
Cc: Imre Deak <imre.deak@intel.com>
Cc: Aditya Swarup <aditya.swarup@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200603211529.3005059-6-matthew.d.roper@intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 43de656..3e6ef5b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7218,30 +7218,33 @@ 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))
+       else if (IS_ROCKETLAKE(dev_priv))
+               return phy <= PHY_D;
+       else if (IS_ELKHARTLAKE(dev_priv))
                return phy <= PHY_C;
-
-       if (INTEL_GEN(dev_priv) >= 11)
+       else if (INTEL_GEN(dev_priv) >= 11)
                return phy <= PHY_B;
-
-       return false;
+       else
+               return false;
 }
 
 bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy)
 {
-       if (INTEL_GEN(dev_priv) >= 12)
+       if (IS_ROCKETLAKE(dev_priv))
+               return false;
+       else if (INTEL_GEN(dev_priv) >= 12)
                return phy >= PHY_D && phy <= PHY_I;
-
-       if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
+       else if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
                return phy >= PHY_C && phy <= PHY_F;
-
-       return false;
+       else
+               return false;
 }
 
 enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port)
 {
-       if (IS_ELKHARTLAKE(i915) && port == PORT_D)
+       if (IS_ROCKETLAKE(i915) && port >= PORT_D)
+               return (enum phy)port - 1;
+       else if (IS_ELKHARTLAKE(i915) && port == PORT_D)
                return PHY_A;
 
        return (enum phy)port;
@@ -16818,7 +16821,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
        if (!HAS_DISPLAY(dev_priv) || !INTEL_DISPLAY_ENABLED(dev_priv))
                return;
 
-       if (INTEL_GEN(dev_priv) >= 12) {
+       if (IS_ROCKETLAKE(dev_priv)) {
+               intel_ddi_init(dev_priv, PORT_A);
+               intel_ddi_init(dev_priv, PORT_B);
+               intel_ddi_init(dev_priv, PORT_D);       /* DDI TC1 */
+               intel_ddi_init(dev_priv, PORT_E);       /* DDI TC2 */
+       } else if (INTEL_GEN(dev_priv) >= 12) {
                intel_ddi_init(dev_priv, PORT_A);
                intel_ddi_init(dev_priv, PORT_B);
                intel_ddi_init(dev_priv, PORT_D);

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 96d351f..814a709 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1869,9 +1869,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
 #define _ICL_COMBOPHY_A                        0x162000
 #define _ICL_COMBOPHY_B                        0x6C000
 #define _EHL_COMBOPHY_C                        0x160000
+#define _RKL_COMBOPHY_D                        0x161000
 #define _ICL_COMBOPHY(phy)             _PICK(phy, _ICL_COMBOPHY_A, \
                                              _ICL_COMBOPHY_B, \
-                                             _EHL_COMBOPHY_C)
+                                             _EHL_COMBOPHY_C, \
+                                             _RKL_COMBOPHY_D)
 
 /* CNL/ICL Port CL_DW registers */
 #define _ICL_PORT_CL_DW(dw, phy)       (_ICL_COMBOPHY(phy) + \