From 8b5565b878ea7017db3ebb446f0086e0a5354566 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 10 Jan 2014 18:49:21 +0000 Subject: [PATCH] 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 Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 72453f1f7ae5..715f410c518c 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) || -- 2.20.1