This is a note to let you know that I've just added the patch titled
drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66 Mon Sep 17 00:00:00 2001
From: Chris Wilson <[email protected]>
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 <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/i915/intel_sdvo.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1498,10 +1498,12 @@ intel_sdvo_detect(struct drm_connector *
if (!intel_sdvo_write_cmd(intel_sdvo,
SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0))
return connector_status_unknown;
- if (intel_sdvo->is_tv) {
- /* add 30ms delay when the output type is SDVO-TV */
+
+ /* add 30ms delay when the output type might be TV */
+ if (intel_sdvo->caps.output_flags &
+ (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_CVBS0))
mdelay(30);
- }
+
if (!intel_sdvo_read_response(intel_sdvo, &response, 2))
return connector_status_unknown;
Patches currently in stable-queue which might be from [email protected]
are
queue-2.6.36/drm-i915-overlay-ensure-that-the-reg_bo-is-in-the-gtt-prior-to-writing.patch
queue-2.6.36/i915-reprogram-power-monitoring-registers-on-resume.patch
queue-2.6.36/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch
queue-2.6.36/agp-intel-also-add-b43.1-to-list-of-supported-devices.patch
queue-2.6.36/drm-i915-update-hotplug-interrupts-register-definitions-for-sandybridge.patch
queue-2.6.36/drm-i915-crt-make-sure-the-hotplug-interrupt-is-enabled.patch
queue-2.6.36/intel-gtt-fix-gtt_total_entries-detection.patch
queue-2.6.36/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch
queue-2.6.36/drm-i915-diasable-clock-gating-for-the-panel-power-sequencer.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
