Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 501e01d7 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Make irq_received bool 



irq_received is used as a boolean in i965_irq_handler(), so make it
bool. This also makes i965_irq_handler() closer to i915_irq_handler().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewd-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3ca1cced

drivers/gpu/drm/i915/i915_irq.c

+2 −4
Original line number Diff line number Diff line
@@ -3613,7 +3613,6 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) 
	u32 iir, new_iir;

	u32 pipe_stats[I915_MAX_PIPES];

	unsigned long irqflags;

	int irq_received;

	int ret = IRQ_NONE, pipe;

	u32 flip_mask =

		I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
@@ -3624,10 +3623,9 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) 
	iir = I915_READ(IIR);



	for (;;) {

		bool irq_received = (iir & ~flip_mask) != 0;

		bool blc_event = false;



		irq_received = (iir & ~flip_mask) != 0;



		/* Can't rely on pipestat interrupt bit in iir as it might

		 * have been cleared after the pipestat interrupt was received.

		 * It doesn't set the bit in iir again, but it still produces
@@ -3649,7 +3647,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) 
					DRM_DEBUG_DRIVER("pipe %c underrun\n",

							 pipe_name(pipe));

				I915_WRITE(reg, pipe_stats[pipe]);

				irq_received = 1;

				irq_received = true;

			}

		}

		spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);