drm/i915: Convert HSW/BDW to use port_mask for DDI probe

Make HSW/BDW use port_mask for output probing as well.
To achieve that the strap checks are moved into
intel_ddi_init() itself. Or should we move them to the
runtime port_mask init instead? Maybe not since the hardware
is still there, just not connected to anything.

v2: Account for DDI-E in strap detection
    Keep to the old CRT->DDI init order

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230616140820.11726-8-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 62bf6cc..6172255 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4653,6 +4653,29 @@ static void intel_ddi_tc_encoder_shutdown_complete(struct intel_encoder *encoder
 #define port_tc_name(port) ((port) - PORT_TC1 + '1')
 #define tc_port_name(tc_port) ((tc_port) - TC_PORT_1 + '1')
 
+static bool port_strap_detected(struct drm_i915_private *i915, enum port port)
+{
+       /* straps not used on skl+ */
+       if (DISPLAY_VER(i915) >= 9)
+               return true;
+
+       switch (port) {
+       case PORT_A:
+               return intel_de_read(i915, DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED;
+       case PORT_B:
+               return intel_de_read(i915, SFUSE_STRAP) & SFUSE_STRAP_DDIB_DETECTED;
+       case PORT_C:
+               return intel_de_read(i915, SFUSE_STRAP) & SFUSE_STRAP_DDIC_DETECTED;
+       case PORT_D:
+               return intel_de_read(i915, SFUSE_STRAP) & SFUSE_STRAP_DDID_DETECTED;
+       case PORT_E:
+               return true; /* no strap for DDI-E */
+       default:
+               MISSING_CASE(port);
+               return false;
+       }
+}
+
 void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 {
        struct intel_digital_port *dig_port;
@@ -4661,6 +4684,12 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
        bool init_hdmi, init_dp;
        enum phy phy = intel_port_to_phy(dev_priv, port);
 
+       if (!port_strap_detected(dev_priv, port)) {
+               drm_dbg_kms(&dev_priv->drm,
+                           "Port %c strap not detected\n", port_name(port));
+               return;
+       }
+
        if (!assert_port_valid(dev_priv, port))
                return;
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 89a9bbb..43d6ba9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7408,9 +7408,12 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)
        if (!HAS_DISPLAY(dev_priv))
                return;
 
-       if (DISPLAY_VER(dev_priv) >= 9) {
+       if (HAS_DDI(dev_priv)) {
                enum port port;
 
+               if (intel_ddi_crt_present(dev_priv))
+                       intel_crt_init(dev_priv);
+
                for_each_port_masked(port, DISPLAY_RUNTIME_INFO(dev_priv)->port_mask)
                        intel_ddi_init(dev_priv, port);
 
@@ -7421,24 +7424,6 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)
 
                if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
                        vlv_dsi_init(dev_priv);
-       } else if (HAS_DDI(dev_priv)) {
-               u32 found;
-
-               if (intel_ddi_crt_present(dev_priv))
-                       intel_crt_init(dev_priv);
-
-               /* Haswell uses DDI functions to detect digital outputs. */
-               found = intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED;
-               if (found)
-                       intel_ddi_init(dev_priv, PORT_A);
-
-               found = intel_de_read(dev_priv, SFUSE_STRAP);
-               if (found & SFUSE_STRAP_DDIB_DETECTED)
-                       intel_ddi_init(dev_priv, PORT_B);
-               if (found & SFUSE_STRAP_DDIC_DETECTED)
-                       intel_ddi_init(dev_priv, PORT_C);
-               if (found & SFUSE_STRAP_DDID_DETECTED)
-                       intel_ddi_init(dev_priv, PORT_D);
        } else if (HAS_PCH_SPLIT(dev_priv)) {
                int found;