| From 7f322440b870dd7e69955e4d66b4709fa51c878d Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Fri, 12 Jul 2013 19:52:36 -0300 |
| Subject: drm/i915: don't read or write GEN6_PMIIR on Gen 5 |
| |
| The register doesn't exist on Gen 5. |
| |
| v2: Simplify checks since pm_iir is always 0 on Gen 5 (Chris) |
| |
| Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 221ab43e8abe1e395d4bdd475ee3d4c2548f04ca) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_irq.c | 12 +++++++----- |
| 1 file changed, 7 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c |
| index 287078707881..ed4459e46e10 100644 |
| --- a/drivers/gpu/drm/i915/i915_irq.c |
| +++ b/drivers/gpu/drm/i915/i915_irq.c |
| @@ -1384,7 +1384,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) |
| struct drm_device *dev = (struct drm_device *) arg; |
| drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| int ret = IRQ_NONE; |
| - u32 de_iir, gt_iir, de_ier, pm_iir, sde_ier; |
| + u32 de_iir, gt_iir, de_ier, pm_iir = 0, sde_ier; |
| |
| atomic_inc(&dev_priv->irq_received); |
| |
| @@ -1404,9 +1404,10 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) |
| |
| de_iir = I915_READ(DEIIR); |
| gt_iir = I915_READ(GTIIR); |
| - pm_iir = I915_READ(GEN6_PMIIR); |
| + if (IS_GEN6(dev)) |
| + pm_iir = I915_READ(GEN6_PMIIR); |
| |
| - if (de_iir == 0 && gt_iir == 0 && (!IS_GEN6(dev) || pm_iir == 0)) |
| + if (de_iir == 0 && gt_iir == 0 && pm_iir == 0) |
| goto done; |
| |
| ret = IRQ_HANDLED; |
| @@ -1419,12 +1420,13 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) |
| if (de_iir) |
| ilk_display_irq_handler(dev, de_iir); |
| |
| - if (IS_GEN6(dev) && pm_iir & GEN6_PM_RPS_EVENTS) |
| + if (pm_iir & GEN6_PM_RPS_EVENTS) |
| gen6_rps_irq_handler(dev_priv, pm_iir); |
| |
| I915_WRITE(GTIIR, gt_iir); |
| I915_WRITE(DEIIR, de_iir); |
| - I915_WRITE(GEN6_PMIIR, pm_iir); |
| + if (pm_iir) |
| + I915_WRITE(GEN6_PMIIR, pm_iir); |
| |
| done: |
| I915_WRITE(DEIER, de_ier); |
| -- |
| 1.8.5.rc3 |
| |