From dc46c67aa5cc3a442b44122bc039ecae10d42f47 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 22 Feb 2013 00:53:05 +0100
Subject: [PATCH] --- yaml --- r: 371167 b: refs/heads/master c:
 83f377abed03e46eb3b6ce14a91291e7cdf86647 h: refs/heads/master i:   371165:
 0f3c3ede218de742c52b0df0be039708dfd126ed   371163:
 92c6f81bd6ed05b69c83b10e60c5a042ab1eb043   371159:
 44f91e179c8d3dd3b156e93d7cd47ea86701e5af   371151:
 e414a1a75bec36438191f5817dcb594b481a227c   371135:
 45a20ab46c071bf08e889bf5673e4fd528d26280 v: v3

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

diff --git a/[refs] b/[refs]
index b1cd83c8b9c1..eb2ecf7f81d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d9bcebe13397f6621a44b998860ae0c8049b10c
+refs/heads/master: 83f377abed03e46eb3b6ce14a91291e7cdf86647
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 9b0cd866fb6b..878e1e3e0667 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4518,11 +4518,7 @@ static void i8xx_update_pll(struct drm_crtc *crtc,
 			dpll |= PLL_P2_DIVIDE_BY_4;
 	}
 
-	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_TVOUT))
-		/* XXX: just matching BIOS for now */
-		/*	dpll |= PLL_REF_INPUT_TVCLKINBC; */
-		dpll |= 3;
-	else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
+	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
 		 intel_panel_use_ssc(dev_priv) && num_connectors < 2)
 		dpll |= PLLB_REF_INPUT_SPREADSPECTRUMIN;
 	else