From patchwork Sat Aug 20 05:09:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sagar.a.kamble@intel.com X-Patchwork-Id: 9291553 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E76E460572 for ; Sat, 20 Aug 2016 05:07:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D936F2947E for ; Sat, 20 Aug 2016 05:07:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD8C529488; Sat, 20 Aug 2016 05:07:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8D3382947E for ; Sat, 20 Aug 2016 05:07:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2056E6E35F; Sat, 20 Aug 2016 05:07:37 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 667996E35E for ; Sat, 20 Aug 2016 05:07:28 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 19 Aug 2016 22:07:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.28,548,1464678000"; d="scan'208"; a="1038882968" Received: from sakamble-desktop.iind.intel.com ([10.223.82.59]) by orsmga002.jf.intel.com with ESMTP; 19 Aug 2016 22:07:27 -0700 From: Sagar Arun Kamble To: intel-gfx@lists.freedesktop.org Date: Sat, 20 Aug 2016 10:39:12 +0530 Message-Id: <1471669765-5935-14-git-send-email-sagar.a.kamble@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471669765-5935-1-git-send-email-sagar.a.kamble@intel.com> References: <1471669765-5935-1-git-send-email-sagar.a.kamble@intel.com> Cc: Tom O'Rourke Subject: [Intel-gfx] drm/i915/slpc: Send shutdown event 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-Virus-Scanned: ClamAV using ClamSMTP From: Tom O'Rourke Send SLPC shutdown event during disable, suspend, and reset operations. Sending shutdown event while already shutdown is OK. v2: return void instead of ignored error code (Paulo) v5: Removed WARN_ON for checking msb of gtt address of shared gem obj. (ChrisW) Added SLPC state update during disable, suspend and reset. Changed semantics of reset. It is supposed to just disable. (Sagar) Signed-off-by: Tom O'Rourke Signed-off-by: Sagar Arun Kamble Reviewed-by: David Weinehall --- drivers/gpu/drm/i915/intel_slpc.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_slpc.c b/drivers/gpu/drm/i915/intel_slpc.c index 161cd13..5a1e6f2 100644 --- a/drivers/gpu/drm/i915/intel_slpc.c +++ b/drivers/gpu/drm/i915/intel_slpc.c @@ -52,6 +52,19 @@ static void host2guc_slpc_reset(struct drm_i915_private *dev_priv) host2guc_slpc(dev_priv, data, 4); } +static void host2guc_slpc_shutdown(struct drm_i915_private *dev_priv) +{ + u32 data[4]; + u32 shared_data_gtt_offset = i915_ggtt_offset(dev_priv->guc.slpc.vma); + + data[0] = HOST2GUC_ACTION_SLPC_REQUEST; + data[1] = SLPC_EVENT(SLPC_EVENT_SHUTDOWN, 2); + data[2] = shared_data_gtt_offset; + data[3] = 0; + + host2guc_slpc(dev_priv, data, 4); +} + static u8 slpc_get_platform_sku(struct drm_device *dev) { enum slpc_platform_sku platform_sku; @@ -149,12 +162,14 @@ void intel_slpc_cleanup(struct drm_i915_private *dev_priv) void intel_slpc_suspend(struct drm_i915_private *dev_priv) { - return; + host2guc_slpc_shutdown(dev_priv); + dev_priv->guc.slpc.enabled = false; } void intel_slpc_disable(struct drm_i915_private *dev_priv) { - return; + host2guc_slpc_shutdown(dev_priv); + dev_priv->guc.slpc.enabled = false; } void intel_slpc_enable(struct drm_i915_private *dev_priv) @@ -167,5 +182,6 @@ void intel_slpc_enable(struct drm_i915_private *dev_priv) void intel_slpc_reset(struct drm_i915_private *dev_priv) { - return; + host2guc_slpc_shutdown(dev_priv); + dev_priv->guc.slpc.enabled = false; }