From 96ec1c51125c98991467b252030f6c736b561c3d Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat, 28 Jan 2012 14:49:22 +0100
Subject: [PATCH] --- yaml --- r: 293583 b: refs/heads/master c:
 5def474ec6e37fe8dbac5070da4899931d46bf1f h: refs/heads/master i:   293581:
 c07ac1a19a2f6b4d7146e3b53463bef18980aff8   293579:
 3f58c69cd32a21f12d6c5192f6eb81c41b7f24ec   293575:
 4786222c1e389ff73b341a712b7a42436f4abd6e   293567:
 26128c43cc1c4302980a1f6db5eaf6fd527e27d6 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 fbcea914ab0c..183ba62c89e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99fca60c76ffbdbf64aa00abf671014f711aea0e
+refs/heads/master: 5def474ec6e37fe8dbac5070da4899931d46bf1f
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index dc765a60a7e7..d588aec47904 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -5975,7 +5975,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
 
 	pipeconf &= ~PIPECONF_INTERLACE_MASK;
 	if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {
-		pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
+		pipeconf |= PIPECONF_INTERLACED_ILK;
 		/* the chip adds 2 halflines automatically */
 		adjusted_mode->crtc_vtotal -= 1;
 		adjusted_mode->crtc_vblank_end -= 1;