---

yaml --- r: 345245 b: refs/heads/master c: 25e78e9 h: refs/heads/master i: 345243: 635aeb7 v: v3
git-mirror · Nov 11, 2012 · b99afb8 · b99afb8
1 parent 0d6c16b
commit b99afb8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fb033d71d79c5a2827671bd8a2886bca0339ccc
+refs/heads/master: 25e78e90f33a783e8129e29c1a567a63300ca8ce
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1689,10 +1689,6 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv,
 	assert_fdi_tx_enabled(dev_priv, pipe);
 	assert_fdi_rx_enabled(dev_priv, pipe);
 
-	if (IS_HASWELL(dev_priv->dev) && pipe > 0) {
-		DRM_ERROR("Attempting to enable transcoder on Haswell with pipe > 0\n");
-		return;
-	}
 	reg = TRANSCONF(pipe);
 	val = I915_READ(reg);
 	pipeconf_val = I915_READ(PIPECONF(pipe));