From c02018106b6c04f78a5de12d12e4665c1535bf26 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun, 25 Mar 2012 22:56:14 +0200
Subject: [PATCH] --- yaml --- r: 306983 b: refs/heads/master c:
 d42c9e2c24f7e7897405b85816bdf4ac924881c0 h: refs/heads/master i:   306981:
 da39d8fd75e221a6df00d73938f9473b16d1d895   306979:
 36d29e74b929e7e39458afbed5deb0ddb12c4162   306975:
 c3ac899d106ff8c7a530af8b6e02affa7f5fdf9c v: v3

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

diff --git a/[refs] b/[refs]
index b3b91ebcc9e6..06377dbba650 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d83f4426fa0555c98c989915be6df01a8125aca
+refs/heads/master: d42c9e2c24f7e7897405b85816bdf4ac924881c0
diff --git a/trunk/drivers/gpu/drm/i915/intel_tv.c b/trunk/drivers/gpu/drm/i915/intel_tv.c
index 05f765ef5464..ca12c709f3eb 100644
--- a/trunk/drivers/gpu/drm/i915/intel_tv.c
+++ b/trunk/drivers/gpu/drm/i915/intel_tv.c
@@ -1153,6 +1153,15 @@ intel_tv_detect_type(struct intel_tv *intel_tv,
 		   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);
 	POSTING_READ(TV_DAC);