---

yaml --- r: 345247 b: refs/heads/master c: 1f6921c h: refs/heads/master i: 345245: b99afb8 345243: 635aeb7 345239: 48d3411 345231: dd4ce0a 345215: 3baeb37 v: v3
git-mirror · Nov 11, 2012 · 7921171 · 7921171
1 parent 35b9ba0
commit 7921171
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a35f267946947b3798827a783d82d3d2aa55697d
+refs/heads/master: 1f6921c8c679e5e2086792bcd62d1616fa171a87
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1722,16 +1722,10 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
 {
 	int reg;
 	u32 val, pipeconf_val;
-	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
 
 	/* PCH only available on ILK+ */
 	BUG_ON(dev_priv->info->gen < 5);
 
-	/* Make sure PCH DPLL is enabled */
-	assert_pch_pll_enabled(dev_priv,
-			       to_intel_crtc(crtc)->pch_pll,
-			       to_intel_crtc(crtc));
-
 	/* FDI must be feeding us bits for PCH ports */
 	assert_fdi_tx_enabled(dev_priv, pipe);
 	assert_fdi_rx_enabled(dev_priv, pipe);