From: Paulo Zanoni Subject: [PATCH 4/5] drm/i915: invert {ilk, snb}_gt_irq_handler check Date: Fri, 19 Jul 2013 18:57:55 -0300 Message-ID: <1374271075-3086-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-gh0-f178.google.com (mail-gh0-f178.google.com [209.85.160.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C992E5CCA for ; Fri, 19 Jul 2013 14:58:02 -0700 (PDT) Received: by mail-gh0-f178.google.com with SMTP id g15so1456383ghb.9 for ; Fri, 19 Jul 2013 14:58:02 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni Requested by Chris Wilson on IRC. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 58ee826..f708e4e 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -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; } -- 1.8.1.2