From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 12/15] drm/i915: really clear the IIR registers on i8xx Date: Tue, 23 Jul 2013 19:33:52 -0300 Message-ID: <1374618835-28120-13-git-send-email-przanoni@gmail.com> References: <1374618835-28120-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-yh0-f51.google.com (mail-yh0-f51.google.com [209.85.213.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A7CFE6533 for ; Tue, 23 Jul 2013 15:35:07 -0700 (PDT) Received: by mail-yh0-f51.google.com with SMTP id 29so1369305yhl.38 for ; Tue, 23 Jul 2013 15:35:06 -0700 (PDT) In-Reply-To: <1374618835-28120-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 Same thing as "drm/i915: really clear the IIR registers", but on a separate patch for easier bisecting. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_irq.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 7588ad3..a936c59 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -82,10 +82,14 @@ static const u32 hpd_status_i915[] = { /* i915 and valleyview are the same */ #define INTEL_IRQ_REG_RESET16(type, do_iir) do { \ I915_WRITE16(type##MR, 0xffff); \ I915_WRITE16(type##ER, 0); \ - if (do_iir) \ - I915_WRITE16(type##IR, I915_READ16(type##IR)); \ - else \ - POSTING_READ16(type##ER); \ + POSTING_READ16(type##ER); \ + if (do_iir) { \ + I915_WRITE16(type##IR, 0xffff); \ + if (I915_READ16(type##IR)) { \ + I915_WRITE16(type##IR, 0xffff); \ + POSTING_READ16(type##IR); \ + } \ + } \ } while (0) #define INTEL_IRQ_REG_RESET(type) do { \ -- 1.8.1.2