drm/i915: invert {ilk, snb}_gt_irq_handler check
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 19 Jul 2013 21:57:55 +0000 (18:57 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 20 Jul 2013 08:49:03 +0000 (10:49 +0200)
Requested by Chris Wilson on IRC.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

index 58ee8269471f7663639781e7a893742e3bda6c14..f708e4efa1be3cf417bb9851d74582b1b22eec92 100644 (file)
@@ -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;
        }