From patchwork Thu Jan 21 02:26:14 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: 8076891 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 4D891BEEE5 for ; Thu, 21 Jan 2016 02:27:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F365205ED for ; Thu, 21 Jan 2016 02:27:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 87243205E7 for ; Thu, 21 Jan 2016 02:27:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 224037210D; Wed, 20 Jan 2016 18:27:34 -0800 (PST) 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 339FE6E1DE for ; Wed, 20 Jan 2016 18:27:24 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 20 Jan 2016 18:27:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,323,1449561600"; d="scan'208";a="897780475" Received: from torourke-desk.ra.intel.com (HELO localhost.localdomain) ([10.10.35.157]) by fmsmga002.fm.intel.com with ESMTP; 20 Jan 2016 18:27:23 -0800 From: tom.orourke@intel.com To: intel-gfx@lists.freedesktop.org Date: Wed, 20 Jan 2016 18:26:14 -0800 Message-Id: <1453343184-160456-13-git-send-email-tom.orourke@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453343184-160456-1-git-send-email-tom.orourke@intel.com> References: <1453343184-160456-1-git-send-email-tom.orourke@intel.com> Cc: Tom O'Rourke Subject: [Intel-gfx] [RFC 12/22] 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-Spam-Status: No, score=-4.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: Tom O'Rourke Send SLPC shutdown event during disable, suspend, and reset operations. Sending shutdown event while already shutdown is OK. Signed-off-by: Tom O'Rourke --- drivers/gpu/drm/i915/intel_slpc.c | 45 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_slpc.c b/drivers/gpu/drm/i915/intel_slpc.c index 59c54a6..f155d88 100644 --- a/drivers/gpu/drm/i915/intel_slpc.c +++ b/drivers/gpu/drm/i915/intel_slpc.c @@ -50,6 +50,30 @@ static int host2guc_slpc_reset(struct drm_i915_private *dev_priv) return ret; } +static int host2guc_slpc_shutdown(struct drm_i915_private *dev_priv) +{ + struct drm_i915_gem_object *obj = dev_priv->guc.slpc.shared_data_obj; + u32 data[4]; + int ret; + u64 shared_data_gtt_offset = i915_gem_obj_ggtt_offset(obj); + + data[0] = HOST2GUC_ACTION_SLPC_REQUEST; + data[1] = SLPC_EVENT(SLPC_EVENT_SHUTDOWN, 2); + data[2] = lower_32_bits(shared_data_gtt_offset); + data[3] = upper_32_bits(shared_data_gtt_offset); + + WARN_ON(0 != data[3]); + + ret = host2guc_action(&dev_priv->guc, data, 4); + + if (0 == ret) { + ret = I915_READ(SOFT_SCRATCH(1)); + ret &= 0xFF; + } + + return ret; +} + static u8 slpc_get_platform_sku(struct drm_i915_gem_object *obj) { struct drm_device *dev = obj->base.dev; @@ -158,15 +182,23 @@ int intel_slpc_cleanup(struct drm_device *dev) int intel_slpc_suspend(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + int ret = 0; - return 0; + if (dev_priv->guc.slpc.shared_data_obj) + ret = host2guc_slpc_shutdown(dev_priv); + + return ret; } int intel_slpc_disable(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + int ret = 0; - return 0; + if (dev_priv->guc.slpc.shared_data_obj) + ret = host2guc_slpc_shutdown(dev_priv); + + return ret; } int intel_slpc_enable(struct drm_device *dev) @@ -183,6 +215,13 @@ int intel_slpc_enable(struct drm_device *dev) int intel_slpc_reset(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + int ret = 0; - return 0; + if (dev_priv->guc.slpc.shared_data_obj) { + ret = host2guc_slpc_shutdown(dev_priv); + /* ignore failed shutdown, continue wth reset */ + ret = host2guc_slpc_reset(dev_priv); + } + + return ret; }