From 19d02f33250f56a0a35ec8aa6115777211cf1a5b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 14:25:51 +1000
Subject: [PATCH] --- yaml --- r: 196477 b: refs/heads/master c:
 d4b74bf07873da2e94219a7b67a334fc1c3ce649 h: refs/heads/master i:   196475:
 a185d53600c143406e6a6bdbdc636928f6ec8119 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/intel_tv.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index b0d26bc75693..c833e4a25d7e 100644
--- 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
index 081cb9014525..6d553c29d106 100644
--- 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);