From patchwork Wed Jan 22 19:52:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3525191 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 313FFC02DC for ; Wed, 22 Jan 2014 19:53:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 551712017E for ; Wed, 22 Jan 2014 19:53:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 74D9F2017B for ; Wed, 22 Jan 2014 19:53:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CFB631059E3; Wed, 22 Jan 2014 11:53:25 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f48.google.com (mail-yh0-f48.google.com [209.85.213.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F98A1059CC for ; Wed, 22 Jan 2014 11:53:22 -0800 (PST) Received: by mail-yh0-f48.google.com with SMTP id f10so33361yha.7 for ; Wed, 22 Jan 2014 11:53:21 -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=cMc5j1oW4Nj6PrcGi07rGJHfQF5qbgrcSylC2kaVyd4=; b=RbFH+V3xXGZA1YEM+1+qUIzO4R1FCMfKugsHadZpg6uyzcq9tTLQfP7PQTUhEk44BO IrBa1xrPrIAty9iAXvtTLV03sOTeC7A/p1F63nK+DYz+mUTHmAwo4Wfnuqbh5VzwvYqL BdAxHEYu/wgz0BPC6kR7vb6PjOATkjMOwIXi5Sb2Fa0SweHnhJS/IUSUtdPfe+Lac6Ve JtYM0IkpBb9ek4XOgyZ4B5ndXlbaWpC7stX/1u/tUgl6R5JIZOZ9MZE007NWu1S/CDpJ VlnWg7DtHKy3vGDIkN8VbdRDk5w2gp2zVp4PCNgDR0RTHVW9PDG3uv0EHVhIL/c0NbLe 8hng== X-Received: by 10.236.144.194 with SMTP id n42mr3630647yhj.114.1390420401859; Wed, 22 Jan 2014 11:53:21 -0800 (PST) Received: from localhost.localdomain ([187.112.59.220]) by mx.google.com with ESMTPSA id f78sm27457275yhp.12.2014.01.22.11.53.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jan 2014 11:53:21 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Jan 2014 17:52:23 -0200 Message-Id: <1390420357-23669-6-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 05/19] drm/i915: don't forget to uninstall the PM IRQs 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@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 We basically never test the uninstall path today, that's why this works. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_irq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index d58c392..65dec2f 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3070,6 +3070,8 @@ static void ironlake_irq_uninstall(struct drm_device *dev) I915_WRITE(GEN7_ERR_INT, I915_READ(GEN7_ERR_INT)); GEN5_IRQ_FINI(GT); + if (INTEL_INFO(dev)->gen >= 6) + GEN5_IRQ_FINI(GEN6_PM); if (HAS_PCH_NOP(dev)) return;