---

yaml --- r: 293583 b: refs/heads/master c: 5def474 h: refs/heads/master i: 293581: c07ac1a 293579: 3f58c69 293575: 4786222 293567: 26128c4 v: v3
git-mirror · Feb 10, 2012 · 96ec1c5 · 96ec1c5
1 parent 6fa821e
commit 96ec1c5
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: 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
@@ -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;