aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-01-10 18:49:21 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-01-10 22:27:13 +0100
commit8b5565b878ea7017db3ebb446f0086e0a5354566 (patch)
tree425448ee3b3b8fc5e75ef5ccceeb8a77a69107f6 /drivers/gpu/drm/i915/i915_irq.c
parent3432087ef846d760427eceff0ff4e7d0a2565b8a (diff)
drm/i915: Only complain about a rogue hotplug IRQ after disabling
Disabling the hotplug IRQ is a two-step process. First, inside the IRQ handler we mark the rogue hotplug pin for disabling. Then later in the hotplug worker, we actually disable the hotplug pin. So we should not WARN about the rogue hotplug IRQ being sent until after we have completed disabling the pin. References: https://bugzilla.redhat.com/show_bug.cgi?id=1051170 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 72453f1f7ae..715f410c518 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1234,7 +1234,7 @@ static inline void intel_hpd_irq_handler(struct drm_device *dev,
for (i = 1; i < HPD_NUM_PINS; i++) {
WARN_ONCE(hpd[i] & hotplug_trigger &&
- dev_priv->hpd_stats[i].hpd_mark != HPD_ENABLED,
+ dev_priv->hpd_stats[i].hpd_mark == HPD_DISABLED,
"Received HPD interrupt although disabled\n");
if (!(hpd[i] & hotplug_trigger) ||