---

yaml --- r: 371167 b: refs/heads/master c: 83f377a h: refs/heads/master i: 371165: 0f3c3ed 371163: 92c6f81 371159: 44f91e1 371151: e414a1a 371135: 45a20ab v: v3
git-mirror · Mar 3, 2013 · dc46c67 · dc46c67
1 parent 727cf41
commit dc46c67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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