[kernel] r16726 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 23:08:15 2010
New Revision: 16726

Log:
drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable

backported 2.6.35 fix

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec 20 23:01:24 2010	(r16725)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 23:08:15 2010	(r16726)
@@ -25,6 +25,7 @@
   * drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode().
   * drm/radeon/kms: add workaround for dce3 ddc line vbios bug.
   * drm/radeon/kms: fix interlaced and doublescan handling.
+  * drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch	Mon Dec 20 23:08:15 2010	(r16726)
@@ -0,0 +1,42 @@
+From ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Wed, 24 Nov 2010 17:37:17 +0000
+Subject: drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
+
+From: Chris Wilson <chris at chris-wilson.co.uk>
+
+commit ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66 upstream.
+
+Commit d09c23de intended to add a 30ms delay to give the ADD time to
+detect any TVs connected. However, it used the sdvo->is_tv flag to do so
+which is dependent upon the previous detection result and not whether the
+output supports TVs.
+
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+[ trivial backport -maks ]
+
+---
+ drivers/gpu/drm/i915/intel_sdvo.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: linux/drivers/gpu/drm/i915/intel_sdvo.c
+===================================================================
+--- linux.orig/drivers/gpu/drm/i915/intel_sdvo.c
++++ linux/drivers/gpu/drm/i915/intel_sdvo.c
+@@ -1580,10 +1580,10 @@ static enum drm_connector_status intel_s
+ 
+ 	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);
+-	}
++	/* add 30ms delay when the output type might be TV */
++	if (sdvo_priv->caps.output_flags &
++	    (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_CVBS0))
++ 		mdelay(30);
+ 	status = intel_sdvo_read_response(intel_output, &response, 2);
+ 
+ 	DRM_DEBUG_KMS("SDVO response %d %d\n", response & 0xff, response >> 8);

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 23:01:24 2010	(r16725)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 23:08:15 2010	(r16726)
@@ -13,3 +13,4 @@
 + bugfix/all/drm-radeon-kms-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch
 + bugfix/all/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
 + bugfix/all/drm-radeon-kms-fix-interlaced-and-doublescan-handling.patch
++ bugfix/all/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch