From 693804c3e04048bd8d911fe08b86d0ca65a1f4fe Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 4 Dec 2010 23:48:40 +0000
Subject: [PATCH] --- yaml --- r: 228781 b: refs/heads/master c:
 f7746f0e1f271fbc64b57c29873c47f73e28e5a0 h: refs/heads/master i:   228779:
 176fdc0c6b98d6e19d2bcfb117c66a25c74318d2 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 c046d57ed0fe..128ba150ca5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec14ad3132702694f2e1a90b30641cf111183b9
+refs/heads/master: f7746f0e1f271fbc64b57c29873c47f73e28e5a0
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 0b6272a2edfc..83446b55f731 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3456,7 +3456,7 @@ static void ironlake_update_wm(struct drm_device *dev,
 	 * display plane is used.
 	 */
 	tmp = 0;
-	if (enabled == 1 && /* XXX disabled due to buggy implmentation? */ 0) {
+	if (enabled == 1) {
 		unsigned long line_time_us;
 		int small, large, plane_fbc;
 		int sr_clock, entries;