[Intel-gfx] [PATCH] [drm/i915] Eliminate WARN calls from irq_handler on unexpected pipestat

Keith Packard keithp at keithp.com
Fri Nov 21 09:55:06 CET 2008


pipestat can be set when iir is unset due to our ordering of pipestat and
iir writes. Remove a WARN left when the code to always read pipestat was
added.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 drivers/gpu/drm/i915/i915_irq.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 879a696..a67cd41 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -203,19 +203,11 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 		 */
 		if (pipea_stats & 0x8000ffff) {
 			I915_WRITE(PIPEASTAT, pipea_stats);
-			WARN((iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) == 0 &&
-			     (pipea_stats & vblank_enable) != 0 &&
-			     (pipea_stats & vblank_status) != 0,
-			     "Pipe A vblank event not in IIR\n");
 			irq_received = 1;
 		}
 
 		if (pipeb_stats & 0x8000ffff) {
 			I915_WRITE(PIPEBSTAT, pipeb_stats);
-			WARN((iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) == 0 &&
-			     (pipeb_stats & vblank_enable) &&
-			     (pipeb_stats & vblank_status) != 0,
-			     "Pipe B vblank event not in IIR\n");
 			irq_received = 1;
 		}
 		spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
-- 
1.5.6.5




More information about the Intel-gfx mailing list