releases/2.6.36.2/drm-i915-crt-make-sure-the-hotplug-interrupt-is-enabled.patch

   1 From 1510a97182b4ddb5fe3c4e8d05240f7cd6fd13e7 Mon Sep 17 00:00:00 2001
   2 From: Yuanhan Liu <yuanhan.liu@intel.com>
   3 Date: Fri, 8 Oct 2010 10:18:01 +0100
   4 Subject: drm/i915/crt: Make sure the hotplug interrupt is enabled
   5
   6 From: Yuanhan Liu <yuanhan.liu@intel.com>
   7
   8 commit 1510a97182b4ddb5fe3c4e8d05240f7cd6fd13e7 upstream.
   9
  10 After disabling the hotplug interrupts for VGA detection on Ironlake, be
  11 sure to re-enable them again afterwards.
  12
  13 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30378
  14 Signed-off-by: Yuanhan Liu <yuanhan.liu@intel.com>
  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_crt.c |    3 ++-
  20  1 file changed, 2 insertions(+), 1 deletion(-)
  21
  22 --- a/drivers/gpu/drm/i915/intel_crt.c
  23 +++ b/drivers/gpu/drm/i915/intel_crt.c
  24 @@ -191,7 +191,8 @@ static bool intel_ironlake_crt_detect_ho
  25                 DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
  26
  27         if (turn_off_dac) {
  28 -               I915_WRITE(PCH_ADPA, temp);
  29 +               /* Make sure hotplug is enabled */
  30 +               I915_WRITE(PCH_ADPA, temp | ADPA_CRT_HOTPLUG_ENABLE);
  31                 (void)I915_READ(PCH_ADPA);
  32         }
  33