---

yaml --- r: 218304 b: refs/heads/master c: 1510a97 h: refs/heads/master v: v3
git-mirror · Oct 8, 2010 · c860bea · c860bea
1 parent 1a8a2be
commit c860bea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 382b09362711d7d03272230a33767015a277926e
+refs/heads/master: 1510a97182b4ddb5fe3c4e8d05240f7cd6fd13e7
diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/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);
 	}