| From 1d67dbc32fa9cf6ebb1b096c5634bac52e11bc7a Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Fri, 19 Jul 2013 18:57:55 -0300 |
| Subject: drm/i915: invert {ilk, snb}_gt_irq_handler check |
| |
| 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> |
| (cherry picked from commit d8fc8a47105bc744000cec280269e1054921f8d6) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| 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 d9927f60a97e..52a43470e125 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.5.rc3 |
| |
