From patchwork Fri Feb 21 15:32:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 3698041 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 F39B3BF13A for ; Fri, 21 Feb 2014 15:32:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32E8720179 for ; Fri, 21 Feb 2014 15:32:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6811A20122 for ; Fri, 21 Feb 2014 15:32:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF1DCFB54E; Fri, 21 Feb 2014 07:32:01 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EDDAFB546 for ; Fri, 21 Feb 2014 07:31:52 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 21 Feb 2014 07:27:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,519,1389772800"; d="scan'208";a="459503349" Received: from rosetta.fi.intel.com ([10.237.72.72]) by orsmga001.jf.intel.com with ESMTP; 21 Feb 2014 07:31:50 -0800 From: mika.kuoppala@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 21 Feb 2014 17:32:03 +0200 Message-Id: <1392996723-8886-6-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1392996723-8886-1-git-send-email-mika.kuoppala@intel.com> References: <1392996723-8886-1-git-send-email-mika.kuoppala@intel.com> Cc: miku@iki.fi, Mika Kuoppala Subject: [Intel-gfx] [PATCH 5/5] drm/i915: No need to put forcewake after a reset 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=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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: Mika Kuoppala As we now have intel_uncore_forcewake_reset() no need to do explicit put after reset. Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/intel_uncore.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index ae068c1..176b678 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -969,11 +969,9 @@ static int gen6_do_reset(struct drm_device *dev) intel_uncore_forcewake_reset(dev); - /* If reset with a user forcewake, try to restore, otherwise turn it off */ + /* If reset with a user forcewake, try to restore */ if (dev_priv->uncore.forcewake_count) dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL); - else - dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL); if (IS_GEN6(dev) || IS_GEN7(dev)) WARN_ON((__raw_i915_read32(dev_priv, GTFIFOCTL) &