From 9e0966da57b01067762894bf41cb2a4d09ba8b52 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Tue, 16 Apr 2013 13:36:56 +0200
Subject: [PATCH] --- yaml --- r: 371487 b: refs/heads/master c:
 995e6b3dcfa25e5837f103ae6e732fbca1790dd9 h: refs/heads/master i:   371485:
 0786d9886d34a5adc5ae7df548be89797b575ffb   371483:
 fdef296bd0dc92d7007a9acf57696e649ae7c668   371479:
 1e67ff3c13b20699de107fbad26347f9db715803   371471:
 8b8f929ddb28a403ee251b30990eca6d12957a37   371455:
 829b62d7e0e0ebe0d8ccccddf47925b9bc581f52 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_irq.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e5244f9ef038..d188146cbbd3 100644
--- 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
index 2b4967014dc6..b59df6e989cb 100644
--- 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];
 	}