From 7921171a16694c1d56dca07b18727fc1a3b197a4 Mon Sep 17 00:00:00 2001
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Wed, 31 Oct 2012 18:12:46 -0200
Subject: [PATCH] --- yaml --- r: 345247 b: refs/heads/master c:
 1f6921c8c679e5e2086792bcd62d1616fa171a87 h: refs/heads/master i:   345245:
 b99afb8977168a570bb9b1d6375be8bb44514488   345243:
 635aeb79c14b1565520bd6ea48bd10394f684e7a   345239:
 48d3411143d19b7d1642400cba727181f0dbcb60   345231:
 dd4ce0a5ed3916598e91bd3586b83a53e61ff475   345215:
 3baeb372d98ea7aaa1dbb7c18e76bd685f31c4ca v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 73a7f7012392..65c15ee284b5 100644
--- 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
index 2de9a6e4b5fd..87f958908f8e 100644
--- 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);