From patchwork Mon Aug 6 19:31:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 1282411 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 066F9DF288 for ; Tue, 7 Aug 2012 02:25:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932187Ab2HGCZS (ORCPT ); Mon, 6 Aug 2012 22:25:18 -0400 Received: from 209-20-75-48.static.cloud-ips.com ([209.20.75.48]:56915 "EHLO shiva.chad-versace.us" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932123Ab2HGCZS (ORCPT ); Mon, 6 Aug 2012 22:25:18 -0400 Received: by shiva.chad-versace.us (Postfix, from userid 1005) id 8692B885AC; Tue, 7 Aug 2012 02:25:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on shiva.chad-versace.us X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=ALL_TRUSTED, DATE_IN_PAST_06_12 autolearn=no version=3.3.2 Received: from seagal.jf.intel.com (jfdmzpr04-ext.jf.intel.com [134.134.137.73]) by shiva.chad-versace.us (Postfix) with ESMTPSA id 8B129885A2; Tue, 7 Aug 2012 02:24:56 +0000 (UTC) From: Ben Widawsky To: Intel GFX , James Bottomley , dri-devel@lists.freedesktop.org Cc: Chris Wilson , "Rafael J. Wysocki" , Greg Kroah-Hartman , linux-pm@vger.kernel.org, Ben Widawsky Subject: [PATCH] drm/i915: make forcewake work again Date: Mon, 6 Aug 2012 12:31:31 -0700 Message-Id: <1344281491-3129-1-git-send-email-ben@bwidawsk.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1343808372.3047.1.camel@dabdike.int.hansenpartnership.com> References: <1343808372.3047.1.camel@dabdike.int.hansenpartnership.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org While trying to track down the power regression, I noticed that on my SNB I had more severe problems, ie. forcewake seemed to never happen once i915 was loaded. After a bit of bisection, I tracked the bad commit to: commit 7b0cfee1a24efdfe0235bac62e53f686fe8a8e24 Merge: 9756fe3 6b16351 Author: Daniel Vetter Date: Mon Jun 25 19:06:12 2012 +0200 Merge tag 'v3.5-rc4' into drm-intel-next-queued I changed the macro to the inline statement to debug a little better and noticed that the problem went away. It's a bit embarrassing, but I can't figure out what is wrong with the old macro. In any case, I think this warrants further review. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ff569cc..a859169 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1020,10 +1020,13 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL and additional rights"); /* We give fast paths for the really cool registers */ -#define NEEDS_FORCE_WAKE(dev_priv, reg) \ - ((HAS_FORCE_WAKE((dev_priv)->dev)) && \ - ((reg) < 0x40000) && \ - ((reg) != FORCEWAKE)) +static inline bool NEEDS_FORCE_WAKE(struct drm_i915_private *dev_priv, + u32 reg) +{ + return (HAS_FORCE_WAKE(dev_priv->dev)) && + (reg < 0x40000) && + (reg != FORCEWAKE); +} static bool IS_DISPLAYREG(u32 reg) {