From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni 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 Message-ID: <1372969271-3814-4-git-send-email-przanoni@gmail.com> References: <1372969271-3814-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-gg0-f182.google.com (mail-gg0-f182.google.com [209.85.161.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 07137E6536 for ; Thu, 4 Jul 2013 13:21:56 -0700 (PDT) Received: by mail-gg0-f182.google.com with SMTP id f1so512716ggn.27 for ; Thu, 04 Jul 2013 13:21:56 -0700 (PDT) In-Reply-To: <1372969271-3814-1-git-send-email-przanoni@gmail.com> 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 The register doesn't exist on Gen 5. Signed-off-by: Paulo Zanoni --- 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