drm/i915/cnl: Add Port F definition.

Some Cannonlake SKUs will come with a full split between
port A and port E. This will be called port F although it
is not a 6th port, but only a split.

Note this patch alone is not sufficient for port F enabling,
it's just the first step.

v2: Fix size of dvo_ports found by Ander.
v3: Adding missing cases from intel_bios.c for Port_F
v4: Adding other missing cases and fix the commit message.
v5: Rebase on top of display headers rework.
v6 (from Paulo): improve commit message, bikeshed bit definitions.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180111180010.24357-2-paulo.r.zanoni@intel.com

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b820d595ebc837c2c25fd71c06ba24173444648e..b0668202dc7e64287454b42028149aebfd5c503c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1140,6 +1140,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
                {DVO_PORT_HDMIC, DVO_PORT_DPC, -1},
                {DVO_PORT_HDMID, DVO_PORT_DPD, -1},
                {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE},
+               {DVO_PORT_HDMIF, DVO_PORT_DPF, -1},
        };
 
        /*
@@ -1690,6 +1691,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
                [PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, },
                [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, },
                [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, },
+               [PORT_F] = { DVO_PORT_DPF, DVO_PORT_HDMIF, },
        };
        int i;
 
@@ -1728,6 +1730,7 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port)
                [PORT_C] = DVO_PORT_DPC,
                [PORT_D] = DVO_PORT_DPD,
                [PORT_E] = DVO_PORT_DPE,
+               [PORT_F] = DVO_PORT_DPF,
        };
        int i;
 
@@ -1763,6 +1766,7 @@ static bool child_dev_is_dp_dual_mode(const struct child_device_config *child,
                [PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, },
                [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, },
                [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, },
+               [PORT_F] = { DVO_PORT_DPF, DVO_PORT_HDMIF, },
        };
 
        if (port == PORT_A || port >= ARRAY_SIZE(port_mapping))
@@ -1929,6 +1933,11 @@ intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,
                        if (port == PORT_D)
                                return true;
                        break;
+               case DVO_PORT_DPF:
+               case DVO_PORT_HDMIF:
+                       if (port == PORT_F)
+                               return true;
+                       break;
                default:
                        break;
                }

diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h
index a0d2b61693613f26f336c2f85b2402d4e93bdd71..e47638931b5149ca97a9ee1b2b31c22ff1b2a40a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@ -119,6 +119,7 @@ enum port {
        PORT_C,
        PORT_D,
        PORT_E,
+       PORT_F,
 
        I915_MAX_PORTS
 };

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 35c5299feab6862659023ce54f3d99dd45aacbec..71721de39e6ba545aa714c944fa35c860b61da05 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1378,6 +1378,7 @@ static i915_reg_t skl_aux_ctl_reg(struct drm_i915_private *dev_priv,
        case PORT_B:
        case PORT_C:
        case PORT_D:
+       case PORT_F:
                return DP_AUX_CH_CTL(port);
        default:
                MISSING_CASE(port);
@@ -1393,6 +1394,7 @@ static i915_reg_t skl_aux_data_reg(struct drm_i915_private *dev_priv,
        case PORT_B:
        case PORT_C:
        case PORT_D:
+       case PORT_F:
                return DP_AUX_CH_DATA(port, index);
        default:
                MISSING_CASE(port);

diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index 3f5eff49105b8bd4810760eb1e3258c6296b9bec..3d3feee9b5dd112675acd4f1b6bdf3c63a436e5b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -299,6 +299,8 @@ struct bdb_general_features {
 #define DVO_PORT_DPA           10
 #define DVO_PORT_DPE           11                              /* 193 */
 #define DVO_PORT_HDMIE         12                              /* 193 */
+#define DVO_PORT_DPF           13                              /* N/A */
+#define DVO_PORT_HDMIF         14                              /* N/A */
 #define DVO_PORT_MIPIA         21                              /* 171 */
 #define DVO_PORT_MIPIB         22                              /* 171 */
 #define DVO_PORT_MIPIC         23                              /* 171 */

diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
index 545c6e0fea7da5e2400624c0ed1245d25a54deaf..346b1f5cb180c2618d3f9feb3b036d8e7bcdc55e 100644 (file)
--- a/include/drm/i915_component.h
+++ b/include/drm/i915_component.h
@@ -26,9 +26,8 @@
 
 /* MAX_PORT is the number of port
  * It must be sync with I915_MAX_PORTS defined i915_drv.h
- * 5 should be enough as only HSW, BDW, SKL need such fix.
  */
-#define MAX_PORTS 5
+#define MAX_PORTS 6
 
 /**
  * struct i915_audio_component_ops - Ops implemented by i915 driver, called by hda driver