From patchwork Tue Jul 23 22:33:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 2832295 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 110359F243 for ; Tue, 23 Jul 2013 22:39:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 473B02041F for ; Tue, 23 Jul 2013 22:39:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6E3D22041E for ; Tue, 23 Jul 2013 22:39:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B503E67BD for ; Tue, 23 Jul 2013 15:39:09 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f50.google.com (mail-yh0-f50.google.com [209.85.213.50]) by gabe.freedesktop.org (Postfix) with ESMTP id 51C22E6792 for ; Tue, 23 Jul 2013 15:34:58 -0700 (PDT) Received: by mail-yh0-f50.google.com with SMTP id a41so767682yho.23 for ; Tue, 23 Jul 2013 15:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=aljhFBdYylcxTK+5l4qnUVfiCD+sG4FV/CWYVW9mtUg=; b=usSrUuOPmLsz9758PziFWqpuFwsUeWoj8WrEbSZ8FTJW59wygSpl8HuQnsldCmGykX c6VgpXxKYayUYPg0f3grbQHaHSGvQ5CtfMJeTOC1L0ZSfFPDTSVMMnhCxErerePL45lJ x6+qWqJZ/uZ4HcB7FDwovtOxKYy3Bx5fmakLYyLRZwKP6H7YHwenVw+qG6/MubN3fDx6 81NoA8UP1kOALDJs7OmrEWt3VbOyYrtm4yG77Vu6g9U+JQeLFc4ym7SbpqnkRwtxl/uQ S47lXi6JfmJ9PKogHS/ENEUxdK+fmeX4FFoE2UxcuAUTjnyI1sGQ7v/aqdHD83KW26fN k2ag== X-Received: by 10.236.57.3 with SMTP id n3mr16025197yhc.116.1374618897798; Tue, 23 Jul 2013 15:34:57 -0700 (PDT) Received: from localhost.localdomain ([177.16.164.57]) by mx.google.com with ESMTPSA id m63sm48420675yhb.10.2013.07.23.15.34.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Jul 2013 15:34:57 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 23 Jul 2013 19:33:46 -0300 Message-Id: <1374618835-28120-7-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374618835-28120-1-git-send-email-przanoni@gmail.com> References: <1374618835-28120-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 06/15] drm/i915: use INTEL_IRQ_REG_INIT on VLV too X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paulo Zanoni This is a case where the code written doesn't match INTEL_IRQ_REG_INIT perfectly. Call it after clearing PIPESTAT so we make sure that it is cleared while the interrupts are disabled. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_irq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e416848..37420b5 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2236,12 +2236,9 @@ static int valleyview_irq_postinstall(struct drm_device *dev) I915_WRITE(PORT_HOTPLUG_EN, 0); POSTING_READ(PORT_HOTPLUG_EN); - I915_WRITE(VLV_IMR, dev_priv->irq_mask); - I915_WRITE(VLV_IER, enable_mask); - I915_WRITE(VLV_IIR, 0xffffffff); I915_WRITE(PIPESTAT(0), 0xffff); I915_WRITE(PIPESTAT(1), 0xffff); - POSTING_READ(VLV_IER); + INTEL_IRQ_REG_INIT(VLV_I, true, enable_mask, dev_priv->irq_mask); /* Interrupt setup is already guaranteed to be single-threaded, this is * just to make the assert_spin_locked check happy. */