Skip to contentSkip to conversation

drm/i915: invert {ilk, snb}_gt_irq_handler check

PATCH Applied Paulo Zanoni 2 participants 2 messages Jul 19, 2013 – Jul 20, 2013

Subsystems (2)
DRM drivers Intel i915
lore
Share & tools
lore

Paulo Zanoni

author
#0 lore raw

PATCH 4/5 drm/i915: invert {ilk, snb}_gt_irq_handler check

From: Paulo Zanoni <[email protected]>

Requested by Chris Wilson on IRC.

Signed-off-by Paulo Zanoni <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +3 -3
index 58ee826..f708e4e 100644
@@ -1340,10 +1340,10 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
 
 	gt_iir = I915_READ(GTIIR);
 	if (gt_iir) {
-		if (IS_GEN5(dev))
-			ilk_gt_irq_handler(dev, dev_priv, gt_iir);
-		else
+		if (INTEL_INFO(dev)->gen >= 6)
 			snb_gt_irq_handler(dev, dev_priv, gt_iir);
+		else
+			ilk_gt_irq_handler(dev, dev_priv, gt_iir);
 		I915_WRITE(GTIIR, gt_iir);
 		ret = IRQ_HANDLED;
 	}
Signature · 1 line
1.8.1.2
Applied
#1 lore raw
Quoted 5 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Requested by Chris Wilson on IRC.

Signed-off-by Paulo Zanoni <[email protected]>

Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch