diff options
| author | Yuanhan Liu <yuanhan.liu@intel.com> | 2010-10-08 10:18:01 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-08 10:28:29 +0100 |
| commit | 1510a97182b4ddb5fe3c4e8d05240f7cd6fd13e7 (patch) | |
| tree | dc6a49891fd3dc46f066976e4099646a007fc510 /drivers/gpu/drm/i915/intel_crt.c | |
| parent | 382b09362711d7d03272230a33767015a277926e (diff) | |
| download | blackbird-obmc-linux-1510a97182b4ddb5fe3c4e8d05240f7cd6fd13e7.tar.gz blackbird-obmc-linux-1510a97182b4ddb5fe3c4e8d05240f7cd6fd13e7.zip | |
drm/i915/crt: Make sure the hotplug interrupt is enabled
After disabling the hotplug interrupts for VGA detection on Ironlake, be
sure to re-enable them again afterwards.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30378
Signed-off-by: Yuanhan Liu <yuanhan.liu@intel.com>
Cc: stable@kernel.org
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_crt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 389fcd2aea1f..c55c77043357 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -191,7 +191,8 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector) DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER"); if (turn_off_dac) { - I915_WRITE(PCH_ADPA, temp); + /* Make sure hotplug is enabled */ + I915_WRITE(PCH_ADPA, temp | ADPA_CRT_HOTPLUG_ENABLE); (void)I915_READ(PCH_ADPA); } |
