OSDN Git Service

drm/i915/icl: unconditionally init DDI for every port
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Tue, 22 May 2018 00:25:47 +0000 (17:25 -0700)
committerPaulo Zanoni <paulo.r.zanoni@intel.com>
Thu, 14 Jun 2018 21:53:58 +0000 (14:53 -0700)
On ICP, port present straps (from SFUSE_STRAP PCH register) are no
longer supported. Software should determine the presence through BIOS
VBT, hotplug or other mechanisms.

v2: Improve commit message (Lucas).

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180522002558.29262-14-paulo.r.zanoni@intel.com
drivers/gpu/drm/i915/intel_display.c

index 1ac3758..9939e09 100644 (file)
@@ -14045,7 +14045,14 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
        if (intel_crt_present(dev_priv))
                intel_crt_init(dev_priv);
 
-       if (IS_GEN9_LP(dev_priv)) {
+       if (IS_ICELAKE(dev_priv)) {
+               intel_ddi_init(dev_priv, PORT_A);
+               intel_ddi_init(dev_priv, PORT_B);
+               intel_ddi_init(dev_priv, PORT_C);
+               intel_ddi_init(dev_priv, PORT_D);
+               intel_ddi_init(dev_priv, PORT_E);
+               intel_ddi_init(dev_priv, PORT_F);
+       } else if (IS_GEN9_LP(dev_priv)) {
                /*
                 * FIXME: Broxton doesn't support port detection via the
                 * DDI_BUF_CTL_A or SFUSE_STRAP registers, find another way to