---

yaml --- r: 371483 b: refs/heads/master c: c40c0f5 h: refs/heads/master i: 371481: 639c255 371479: 1e67ff3 v: v3
git-mirror · Apr 18, 2013 · fdef296 · fdef296
1 parent e2369ff
commit fdef296
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6af79ae2ae81efb2abd42d908041aa6ac0db9d43
+refs/heads/master: c40c0f5bd5b0f09e4386d2cf26c96c89c45ee539
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -8495,7 +8495,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 		I915_WRITE(PFIT_CONTROL, 0);
 	}
 
-	if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)))
+	if (!IS_ULT(dev))
 		intel_crt_init(dev);
 
 	if (HAS_DDI(dev)) {