From patchwork Thu Mar 13 14:54:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 3826161 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 94B299F2BB for ; Thu, 13 Mar 2014 14:54:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD89C2017A for ; Thu, 13 Mar 2014 14:54:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EE80F20176 for ; Thu, 13 Mar 2014 14:54:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B048FFA971; Thu, 13 Mar 2014 07:54:48 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by gabe.freedesktop.org (Postfix) with ESMTP id F37DDFA971 for ; Thu, 13 Mar 2014 07:54:43 -0700 (PDT) Received: by mail-pa0-f42.google.com with SMTP id fb1so1223684pad.15 for ; Thu, 13 Mar 2014 07:54:43 -0700 (PDT) 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=B5+Oc1bu2xZSZOiyaR8N+TkPFhueeFLVZ8XKEtcfQvU=; b=PzmA7T/Tp/LmUB6Qxso3BOVDXuvCXHFdvqzlHmDRN58slz/AHdkQEewabD7FyiTYjU wZI9S7pyNNhasiu3jUGzSmTggGJ+pp9Di0F+UomF408JGXZH/9LioxH8Ns8Y2DtIx04X wn966V9rm0nHg2hqK1V4BpIpcB8Z+ORE9xe55sEJKIrZaE9PH6hHxIpJpVL3frb048J/ sOdSmFpRYqGfhy1BW8vlEwkjCL7yteH0SfU+FS6moIQjapdvxQ4decFXbsnXKYcflxLn RJsse4TnJNmXmTYjp/9cmZsU3g0JMBnZMb5Zk29eZJhPHhkGn8zc7CcZQ20P67UpcfcB 0wPA== X-Received: by 10.68.215.40 with SMTP id of8mr2828427pbc.15.1394722483835; Thu, 13 Mar 2014 07:54:43 -0700 (PDT) Received: from localhost (jfdmzpr04-ext.jf.intel.com. [134.134.137.73]) by mx.google.com with ESMTPSA id vb7sm7756859pbc.13.2014.03.13.07.54.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2014 07:54:42 -0700 (PDT) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Thu, 13 Mar 2014 11:54:26 -0300 Message-Id: <1394722468-24522-3-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394722468-24522-1-git-send-email-rodrigo.vivi@gmail.com> References: <1394722468-24522-1-git-send-email-rodrigo.vivi@gmail.com> Cc: Deepak S Subject: [Intel-gfx] [PATCH 2/4] drm/i915: Bring UP Power Wells before disabling RC6. 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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: Deepak S We need do forcewake before Disabling RC6, This is what the BIOS expects while going into suspend. v2: updated commit message. (Daniel) Signed-off-by: Deepak S Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_pm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 2aaeb79..122f78c 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3187,8 +3187,14 @@ static void valleyview_disable_rps(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + /* we're doing forcewake before Disabling RC6, + * This what the BIOS expects when going into suspend */ + gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL); + I915_WRITE(GEN6_RC_CONTROL, 0); + gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL); + gen6_disable_rps_interrupts(dev); if (dev_priv->vlv_pctx) {