---

yaml --- r: 371487 b: refs/heads/master c: 995e6b3 h: refs/heads/master i: 371485: 0786d98 371483: fdef296 371479: 1e67ff3 371471: 8b8f929 371455: 829b62d v: v3
git-mirror · Apr 18, 2013 · 9e0966d · 9e0966d
1 parent a766ea7
commit 9e0966d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 821450c6938d9228d8569d54d5c369985b1cc8dd
+refs/heads/master: 995e6b3dcfa25e5837f103ae6e732fbca1790dd9
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -2128,9 +2128,11 @@ static void ibx_hpd_irq_setup(struct drm_device *dev)
 	u32 hotplug;
 
 	if (HAS_PCH_IBX(dev)) {
+		mask &= ~SDE_HOTPLUG_MASK;
 		list_for_each_entry(intel_encoder, &mode_config->encoder_list, base.head)
 			mask |= hpd_ibx[intel_encoder->hpd_pin];
 	} else {
+		mask &= ~SDE_HOTPLUG_MASK_CPT;
 		list_for_each_entry(intel_encoder, &mode_config->encoder_list, base.head)
 			mask |= hpd_cpt[intel_encoder->hpd_pin];
 	}