From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 3/6] drm/i915: don't read or write GEN6_PMIIR on Gen 5
Date: Thu, 4 Jul 2013 17:21:08 -0300 [thread overview]
Message-ID: <1372969271-3814-4-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1372969271-3814-1-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
The register doesn't exist on Gen 5.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index c45578d..f9b97ab 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1366,7 +1366,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);
@@ -1386,7 +1386,8 @@ 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))
goto done;
@@ -1406,7 +1407,8 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
I915_WRITE(GTIIR, gt_iir);
I915_WRITE(DEIIR, de_iir);
- I915_WRITE(GEN6_PMIIR, pm_iir);
+ if (IS_GEN6(dev))
+ I915_WRITE(GEN6_PMIIR, pm_iir);
done:
I915_WRITE(DEIER, de_ier);
--
1.8.1.2
next prev parent reply other threads:[~2013-07-04 20:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 20:21 [PATCH 0/6] ILK/IVB irq handler merge Paulo Zanoni
2013-07-04 20:21 ` [PATCH 1/6] drm/i915: extract ilk_display_irq_handler Paulo Zanoni
2013-07-04 20:21 ` [PATCH 2/6] drm/i915: extract ivb_display_irq_handler Paulo Zanoni
2013-07-04 20:21 ` Paulo Zanoni [this message]
2013-07-04 20:21 ` [PATCH 4/6] drm/i915: reorganize ironlake_irq_handler Paulo Zanoni
2013-07-04 20:21 ` [PATCH 5/6] drm/i915: POSTING_READ(DEIER) on ivybridge_irq_handler Paulo Zanoni
2013-07-04 20:21 ` [PATCH 6/6] drm/i915: add ILK/SNB support to ivybridge_irq_handler Paulo Zanoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372969271-3814-4-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.