releases/2.6.36.2/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch

   1 From ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66 Mon Sep 17 00:00:00 2001
   2 From: Chris Wilson <chris@chris-wilson.co.uk>
   3 Date: Wed, 24 Nov 2010 17:37:17 +0000
   4 Subject: drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
   5
   6 From: Chris Wilson <chris@chris-wilson.co.uk>
   7
   8 commit ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66 upstream.
   9
  10 Commit d09c23de intended to add a 30ms delay to give the ADD time to
  11 detect any TVs connected. However, it used the sdvo->is_tv flag to do so
  12 which is dependent upon the previous detection result and not whether the
  13 output supports TVs.
  14
  15 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17
  18 ---
  19  drivers/gpu/drm/i915/intel_sdvo.c |    8 +++++---
  20  1 file changed, 5 insertions(+), 3 deletions(-)
  21
  22 --- a/drivers/gpu/drm/i915/intel_sdvo.c
  23 +++ b/drivers/gpu/drm/i915/intel_sdvo.c
  24 @@ -1498,10 +1498,12 @@ intel_sdvo_detect(struct drm_connector *
  25         if (!intel_sdvo_write_cmd(intel_sdvo,
  26                              SDVO_CMD_GET_ATTACHED_DISPLAYS, NULL, 0))
  27                 return connector_status_unknown;
  28 -       if (intel_sdvo->is_tv) {
  29 -               /* add 30ms delay when the output type is SDVO-TV */
  30 +
  31 +       /* add 30ms delay when the output type might be TV */
  32 +       if (intel_sdvo->caps.output_flags &
  33 +           (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_CVBS0))
  34                 mdelay(30);
  35 -       }
  36 +
  37         if (!intel_sdvo_read_response(intel_sdvo, &response, 2))
  38                 return connector_status_unknown;
  39