From d95f2c65f85eed37191561a199a8dddc7689fa7f Mon Sep 17 00:00:00 2001
From: Zhao Yakui <yakui.zhao@intel.com>
Date: Fri, 6 Nov 2009 15:39:56 +0800
Subject: [PATCH] --- yaml --- r: 174575 b: refs/heads/master c:
 d09c23de9f967a7b7dcee0ffc57222ddbd821aba h: refs/heads/master i:   174573:
 de9ea6fe2f87e101cad2a0b81af0763b738d3723   174571:
 565de96a54f52a885436f0c904dbc20a93f08454   174567:
 f63d88d7b072888df19eb1048e3689b59a33e9eb   174559:
 fba0d84fa72d954bbc9bbf256c334f145801dde0 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/i915/intel_sdvo.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 056ee14d600b..27c7dadfa894 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04b2d218001bdddb41b84c9f78d6bb3cd3b5b31c
+refs/heads/master: d09c23de9f967a7b7dcee0ffc57222ddbd821aba
diff --git a/trunk/drivers/gpu/drm/i915/intel_sdvo.c b/trunk/drivers/gpu/drm/i915/intel_sdvo.c
index 55b8beb0a152..dba5147f4064 100644
--- a/trunk/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/trunk/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1617,6 +1617,10 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
 
 	intel_sdvo_write_cmd(intel_output,
 			     SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0);
+	if (sdvo_priv->is_tv) {
+		/* add 30ms delay when the output type is SDVO-TV */
+		mdelay(30);
+	}
 	status = intel_sdvo_read_response(intel_output, &response, 2);
 
 	DRM_DEBUG_KMS("SDVO response %d %d\n", response & 0xff, response >> 8);