From patchwork Wed Jan 22 19:52:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3525351 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 CC2039F1C3 for ; Wed, 22 Jan 2014 19:55:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18E2D20176 for ; Wed, 22 Jan 2014 19:55:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4396D2011D for ; Wed, 22 Jan 2014 19:55:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00342FBBD8 for ; Wed, 22 Jan 2014 11:55:32 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f52.google.com (mail-yh0-f52.google.com [209.85.213.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 51298FBBBF for ; Wed, 22 Jan 2014 11:53:31 -0800 (PST) Received: by mail-yh0-f52.google.com with SMTP id v1so328767yhn.25 for ; Wed, 22 Jan 2014 11:53:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0s7Y6d4I1VzeTj/UUOGl/iZbIV9EuIMXrPrca+zwRvk=; b=jHePCND8b6mCYh8Cq+V8rzG0auGBanodcbj3xqv2oLouY0hBc1kORrTW/aRupyC/Hy jdoIulc51xFDNMdIRfkMc7db8YxVs0bvObxdoUxYLxe02Ae77a2FlEroQ9kKINcFQXTb euO4EH3mcvbGkWB4YOyTIjwI7FjnxKTZiSx2z54uMEQ3PpkLZNj+R9SIhkOnfONGBjT6 NTLKytGR9G65MfYAyRVkIq6Bzhc42JCxzBWLc6fvEpdPnuBHTau4Ga3C9XX3I3RYW3i7 5unSb0fVff90hTKTspYRcNSmfUJJaK3gk+7fbqlK86hyZGAP/ECjPRIo8hPD41dokYyW cGSw== X-Received: by 10.236.121.162 with SMTP id r22mr3525828yhh.47.1390420410839; Wed, 22 Jan 2014 11:53:30 -0800 (PST) Received: from localhost.localdomain ([187.112.59.220]) by mx.google.com with ESMTPSA id f78sm27457275yhp.12.2014.01.22.11.53.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jan 2014 11:53:30 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Jan 2014 17:52:29 -0200 Message-Id: <1390420357-23669-12-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1390420357-23669-1-git-send-email-przanoni@gmail.com> References: <1390420357-23669-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 11/19] drm/i915: fix open coded gen5_gt_irq_preinstall 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.7 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 The duplicate was at an _uninstall function, so rename it to gen5_gt_irq_reset. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_irq.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 9a323a9..175d592 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2657,7 +2657,7 @@ static void ibx_irq_preinstall(struct drm_device *dev) POSTING_READ(SDEIER); } -static void gen5_gt_irq_preinstall(struct drm_device *dev) +static void gen5_gt_irq_reset(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -2680,7 +2680,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) if (IS_GEN7(dev)) I915_WRITE(GEN7_ERR_INT, 0xffffffff); - gen5_gt_irq_preinstall(dev); + gen5_gt_irq_reset(dev); ibx_irq_preinstall(dev); } @@ -2700,7 +2700,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev) I915_WRITE(GTIIR, I915_READ(GTIIR)); I915_WRITE(GTIIR, I915_READ(GTIIR)); - gen5_gt_irq_preinstall(dev); + gen5_gt_irq_reset(dev); I915_WRITE(DPINVGTT, 0xff); @@ -3056,10 +3056,7 @@ static void ironlake_irq_uninstall(struct drm_device *dev) if (IS_GEN7(dev)) I915_WRITE(GEN7_ERR_INT, 0xffffffff); - GEN5_IRQ_RESET(GT); - if (INTEL_INFO(dev)->gen >= 6) - GEN5_IRQ_RESET(GEN6_PM); - POSTING_READ(GTIIR); + gen5_gt_irq_reset(dev); if (HAS_PCH_NOP(dev)) return;