---

yaml --- r: 307416 b: refs/heads/master c: 4dc20c0 h: refs/heads/master v: v3
git-mirror · May 8, 2012 · 15e0d46 · 15e0d46
1 parent ae8e936
commit 15e0d46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdf1250aaae12625ee2abaf2ef22def0a4cdf71b
+refs/heads/master: 4dc20c0d185132077522dd92a72db79274e13f65
diff --git a/trunk/drivers/gpu/drm/i915/intel_hdmi.c b/trunk/drivers/gpu/drm/i915/intel_hdmi.c
@@ -187,13 +187,7 @@ static void ibx_write_infoframe(struct drm_encoder *encoder,
 	val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
 	val |= intel_infoframe_index(frame);
 
-	/* The DIP control register spec says that we need to update the AVI
-	 * infoframe without clearing its enable bit */
-	if (frame->type == DIP_TYPE_AVI)
-		val |= VIDEO_DIP_ENABLE_AVI;
-	else
-		val &= ~intel_infoframe_enable(frame);
-
+	val &= ~intel_infoframe_enable(frame);
 	val |= VIDEO_DIP_ENABLE;
 
 	I915_WRITE(reg, val);