@@ -16887,14 +16887,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
if (intel_ddi_crt_present(dev_priv))
intel_crt_init(dev_priv);
- /*
- * Haswell uses DDI functions to detect digital outputs.
- * On SKL pre-D0 the strap isn't connected, so we assume
- * it's there.
- */
found = intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED;
- /* WaIgnoreDDIAStrap: skl */
- if (found || IS_GEN9_BC(dev_priv))
+ if (found)
intel_ddi_init(dev_priv, PORT_A);
/* DDI B, C, D, and F detection is indicated by the SFUSE_STRAP
@@ -16915,7 +16909,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
if (IS_GEN9_BC(dev_priv) &&
intel_bios_is_port_present(dev_priv, PORT_E))
intel_ddi_init(dev_priv, PORT_E);
-
} else if (HAS_PCH_SPLIT(dev_priv)) {
int found;
According to intel_detect_preproduction_hw(), the SKL stepping D0 is still pre-preproduction so we can nuke the additional workaround. WA database says it applies to all steppings, but bspec disagrees. After talking to HW people they said it was fixed either on B0 or D0. While at it, nuke dangling new line. v2: fix typo in commit message (Michael) and note that W/A db disagrees with the steppings this is applicable (Ville). Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)