---

yaml --- r: 196477 b: refs/heads/master c: d4b74bf h: refs/heads/master i: 196475: a185d53 v: v3
git-mirror · Apr 20, 2010 · 19d02f3 · 19d02f3
1 parent 595f9f9
commit 19d02f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb
+refs/heads/master: d4b74bf07873da2e94219a7b67a334fc1c3ce649
diff --git a/trunk/drivers/gpu/drm/i915/intel_tv.c b/trunk/drivers/gpu/drm/i915/intel_tv.c
@@ -1263,15 +1263,6 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_encoder *intel_encoder
 		   DAC_A_0_7_V |
 		   DAC_B_0_7_V |
 		   DAC_C_0_7_V);
-
-	/*
-	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-	 * the TV is misdetected. This is hardware requirement.
-	 */
-	if (IS_GM45(dev))
-		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-
 	I915_WRITE(TV_CTL, tv_ctl);
 	I915_WRITE(TV_DAC, tv_dac);
 	intel_wait_for_vblank(dev);