From fdef296bd0dc92d7007a9acf57696e649ae7c668 Mon Sep 17 00:00:00 2001
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Fri, 12 Apr 2013 18:16:53 -0300
Subject: [PATCH] --- yaml --- r: 371483 b: refs/heads/master c:
 c40c0f5bd5b0f09e4386d2cf26c96c89c45ee539 h: refs/heads/master i:   371481:
 639c255a1e4f63b1c5a3a2c25644054a05661895   371479:
 1e67ff3c13b20699de107fbad26347f9db715803 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d2e58bd0fcbf..b7f5a266cfa3 100644
--- 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
index 1bbf7071e0c4..6a8262867b0b 100644
--- 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)) {