From patchwork Thu Apr 28 01:11:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tom.orourke@intel.com X-Patchwork-Id: 8964841 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B0227BF29F for ; Thu, 28 Apr 2016 01:12:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB5432026D for ; Thu, 28 Apr 2016 01:12:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E0CDD20219 for ; Thu, 28 Apr 2016 01:12:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6E4B6E39E; Thu, 28 Apr 2016 01:11:59 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A918D6E399 for ; Thu, 28 Apr 2016 01:11:25 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 27 Apr 2016 18:11:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,544,1455004800"; d="scan'208";a="941742195" Received: from torourke-desk.ra.intel.com (HELO localhost.localdomain) ([10.10.35.157]) by orsmga001.jf.intel.com with ESMTP; 27 Apr 2016 18:11:25 -0700 From: tom.orourke@intel.com To: intel-gfx@lists.freedesktop.org Date: Wed, 27 Apr 2016 18:11:05 -0700 Message-Id: <1461805865-212590-22-git-send-email-tom.orourke@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461805865-212590-1-git-send-email-tom.orourke@intel.com> References: <1461805865-212590-1-git-send-email-tom.orourke@intel.com> Cc: Tom O'Rourke , radoslaw.szwichtenberg@intel.com, paulo.r.zanoni@intel.com Subject: [Intel-gfx] [PATCH 21/21] drm/i915/slpc: Fail intel_runtime_suspend if SLPC or RPS not active X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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: Sagar Arun Kamble intel_runtime_suspend failed with warning if RPS was disabled. With SLPC enabled, RPS is disabled. With SLPC, warning is now changed to consider SLPC active status as well. This will ensure runtime suspend proceeds when SLPC enabled. v2: Commit message update. (Tom) Signed-off-by: Sagar Arun Kamble Signed-off-by: Tom O'Rourke --- drivers/gpu/drm/i915/i915_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index cc22fa0..00a2713 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1474,7 +1474,8 @@ static int intel_runtime_suspend(struct device *device) struct drm_i915_private *dev_priv = dev->dev_private; int ret; - if (WARN_ON_ONCE(!(dev_priv->rps.enabled && intel_enable_rc6(dev)))) + if (WARN_ON_ONCE(!((dev_priv->rps.enabled || intel_slpc_active(dev)) && + intel_enable_rc6(dev)))) return -ENODEV; if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev)))