drm/i915: Simplify DP vs. eDP detection
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 1 Nov 2013 16:22:41 +0000 (18:22 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 28 Nov 2013 12:42:25 +0000 (13:42 +0100)
Reduce the eDP detection to just checking if it's port A, or if
the VBT tells us that the port is eDP for the other ports.

Suggested-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_dp.c

index 2e5154e5955f4bad3276641bf3eee059810b756e..30c627c7b7ba18a0dbd546859b047a769cad1d64 100644 (file)
@@ -3337,6 +3337,9 @@ bool intel_dp_is_edp(struct drm_device *dev, enum port port)
                [PORT_D] = PORT_IDPD,
        };
 
+       if (port == PORT_A)
+               return true;
+
        if (!dev_priv->vbt.child_dev_num)
                return false;
 
@@ -3621,27 +3624,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
        intel_dp->DP = I915_READ(intel_dp->output_reg);
        intel_dp->attached_connector = intel_connector;
 
-       type = DRM_MODE_CONNECTOR_DisplayPort;
-       /*
-        * FIXME : We need to initialize built-in panels before external panels.
-        * For X0, DP_C is fixed as eDP. Revisit this as part of VLV eDP cleanup
-        */
-       switch (port) {
-       case PORT_A:
+       if (intel_dp_is_edp(dev, port))
                type = DRM_MODE_CONNECTOR_eDP;
-               break;
-       case PORT_B:
-       case PORT_C:
-               if (IS_VALLEYVIEW(dev) && intel_dp_is_edp(dev, port))
-                       type = DRM_MODE_CONNECTOR_eDP;
-               break;
-       case PORT_D:
-               if (HAS_PCH_SPLIT(dev) && intel_dp_is_edp(dev, port))
-                       type = DRM_MODE_CONNECTOR_eDP;
-               break;
-       default:        /* silence GCC warning */
-               break;
-       }
+       else
+               type = DRM_MODE_CONNECTOR_DisplayPort;
 
        /*
         * For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but