---

yaml --- r: 307409 b: refs/heads/master c: 1d4f85a h: refs/heads/master i: 307407: b6fd13a v: v3
git-mirror · May 8, 2012 · 4200691 · 4200691
1 parent d7f4c28
commit 4200691
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: 22509ec8676fdbba8da525b9ec9cb3ddb4cb71b0
+refs/heads/master: 1d4f85ac2d5ef1892deba2a3df8a5695645418c8
diff --git a/trunk/drivers/gpu/drm/i915/intel_hdmi.c b/trunk/drivers/gpu/drm/i915/intel_hdmi.c
@@ -132,7 +132,7 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder,
 	else
 		return;
 
-	val &= ~VIDEO_DIP_SELECT_MASK;
+	val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
 	val |= intel_infoframe_index(frame);
 
 	val |= VIDEO_DIP_ENABLE;