aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2015-11-25 09:47:23 -0500
committerJani Nikula <jani.nikula@intel.com>2015-11-26 09:30:46 -0500
commit820da7ae46332fa709b171eb7ba57cbd023fa6df (patch)
tree30de5059db00e4ec4d253211d1c9c881ccf8bcb8
parent6a39d7c986be4fd18eb019e9cdbf774ec36c9f77 (diff)
Revert "drm/i915: shut up gen8+ SDE irq dmesg noise"
This reverts commit 97e5ed1111dcc5300a0f59a55248cd243937a8ab Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Oct 23 10:56:12 2015 +0200 drm/i915: shut up gen8+ SDE irq dmesg noise With the proper fix ("drm/i915: fix the SDE irq dmesg warnings properly") reliably in place, bring back the error message. Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1448462843-32739-2-git-send-email-jani.nikula@intel.com
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 671f76ccd8df..0677e87c89d7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2365,13 +2365,9 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
2365 spt_irq_handler(dev, pch_iir); 2365 spt_irq_handler(dev, pch_iir);
2366 else 2366 else
2367 cpt_irq_handler(dev, pch_iir); 2367 cpt_irq_handler(dev, pch_iir);
2368 } else { 2368 } else
2369 /* 2369 DRM_ERROR("The master control interrupt lied (SDE)!\n");
2370 * Like on previous PCH there seems to be something 2370
2371 * fishy going on with forwarding PCH interrupts.
2372 */
2373 DRM_DEBUG_DRIVER("The master control interrupt lied (SDE)!\n");
2374 }
2375 } 2371 }
2376 2372
2377 I915_WRITE_FW(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL); 2373 I915_WRITE_FW(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);