---

yaml --- r: 345251 b: refs/heads/master c: 9a76b1c h: refs/heads/master i: 345249: cd05118 345247: 7921171 v: v3
git-mirror · Nov 11, 2012 · 2be268f · 2be268f
1 parent 79e0223
commit 2be268f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69d3ed5a6fc2e7ac8f848711d9bb6af9b3baf77b
+refs/heads/master: 9a76b1c68ffb843ad6f31b746141365fdf262b97
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1732,7 +1732,8 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
 	val = TRANS_ENABLE;
 	pipeconf_val = I915_READ(PIPECONF(cpu_transcoder));
 
-	if ((pipeconf_val & PIPECONF_INTERLACE_MASK) == PIPECONF_INTERLACED_ILK)
+	if ((pipeconf_val & PIPECONF_INTERLACE_MASK_HSW) ==
+	    PIPECONF_INTERLACED_ILK)
 		val |= TRANS_INTERLACED;
 	else
 		val |= TRANS_PROGRESSIVE;