From: tom.orourke@intel.com
To: intel-gfx@lists.freedesktop.org
Cc: paulo.r.zanoni@intel.com, jbarnes@virtuousgeek.org,
Tom O'Rourke <Tom.O'Rourke@intel.com>
Subject: [PATCH 12/25] drm/i915/slpc: Send shutdown event
Date: Wed, 6 Apr 2016 12:24:30 -0700 [thread overview]
Message-ID: <1459970683-97940-13-git-send-email-tom.orourke@intel.com> (raw)
In-Reply-To: <1459970683-97940-1-git-send-email-tom.orourke@intel.com>
From: Tom O'Rourke <Tom.O'Rourke@intel.com>
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)
Signed-off-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
---
drivers/gpu/drm/i915/intel_slpc.c | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_slpc.c b/drivers/gpu/drm/i915/intel_slpc.c
index 76e5ba9..97b2163 100644
--- a/drivers/gpu/drm/i915/intel_slpc.c
+++ b/drivers/gpu/drm/i915/intel_slpc.c
@@ -56,6 +56,23 @@ static void host2guc_slpc_reset(struct drm_device *dev)
host2guc_slpc(dev_priv, data, 4);
}
+static void host2guc_slpc_shutdown(struct drm_device *dev)
+{
+ struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_gem_object *obj = dev_priv->guc.slpc.shared_data_obj;
+ u32 data[4];
+ 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]);
+
+ host2guc_slpc(dev_priv, data, 4);
+}
+
static u8 slpc_get_platform_sku(struct drm_i915_gem_object *obj)
{
struct drm_device *dev = obj->base.dev;
@@ -152,12 +169,14 @@ void intel_slpc_cleanup(struct drm_device *dev)
void intel_slpc_suspend(struct drm_device *dev)
{
- return;
+ if (intel_slpc_active(dev))
+ host2guc_slpc_shutdown(dev);
}
void intel_slpc_disable(struct drm_device *dev)
{
- return;
+ if (intel_slpc_active(dev))
+ host2guc_slpc_shutdown(dev);
}
void intel_slpc_enable(struct drm_device *dev)
@@ -168,5 +187,8 @@ void intel_slpc_enable(struct drm_device *dev)
void intel_slpc_reset(struct drm_device *dev)
{
- return;
+ if (intel_slpc_active(dev)) {
+ host2guc_slpc_shutdown(dev);
+ host2guc_slpc_reset(dev);
+ }
}
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-04-06 19:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 19:24 [PATCH v3 00/25] Add support for GuC-based SLPC tom.orourke
2016-04-06 19:24 ` [PATCH 01/25] drm/i915/slpc: Expose guc functions for use with SLPC tom.orourke
2016-04-06 19:24 ` [PATCH 02/25] drm/i915/slpc: Add has_slpc capability flag tom.orourke
2016-04-06 19:24 ` [PATCH 03/25] drm/i915/slpc: Add slpc_version_check tom.orourke
2016-04-06 19:24 ` [PATCH 04/25] drm/i915/slpc: Add enable_slpc module parameter tom.orourke
2016-04-06 19:24 ` [PATCH 05/25] drm/i915/slpc: Use intel_slpc_* functions if supported tom.orourke
2016-04-06 19:24 ` [PATCH 06/25] drm/i915/slpc: Enable SLPC in guc " tom.orourke
2016-04-06 19:24 ` [PATCH 07/25] drm/i915/slpc: If using SLPC, do not set frequency tom.orourke
2016-04-06 19:24 ` [PATCH 08/25] drm/i915/slpc: Allocate/Release/Initialize SLPC shared data tom.orourke
2016-04-06 19:24 ` [PATCH 09/25] drm/i915/slpc: Setup rps frequency values during SLPC init tom.orourke
2016-04-06 19:24 ` [PATCH 10/25] drm/i915/slpc: Update current requested frequency tom.orourke
2016-04-06 19:24 ` [PATCH 11/25] drm/i915/slpc: Send reset event tom.orourke
2016-04-06 19:24 ` tom.orourke [this message]
2016-04-06 19:24 ` [PATCH 13/25] drm/i915/slpc: Add Display mode event related data structures tom.orourke
2016-04-06 19:24 ` [PATCH 14/25] drm/i915/slpc: Notification of Display mode change tom.orourke
2016-04-06 19:24 ` [PATCH 15/25] drm/i915/slpc: Notification of Refresh Rate change tom.orourke
2016-04-06 19:24 ` [PATCH 16/25] drm/i915/slpc: Add slpc_status enum values tom.orourke
2016-04-06 19:24 ` [PATCH 17/25] drm/i915/slpc: Add parameter unset/set/get functions tom.orourke
2016-04-06 19:24 ` [PATCH 18/25] drm/i915/slpc: Add slpc support for max/min freq tom.orourke
2016-04-06 19:37 ` Martin Peres
2016-04-06 19:24 ` [PATCH 19/25] drm/i915/slpc: Add enable/disable debugfs for slpc tom.orourke
2016-04-06 19:24 ` [PATCH 20/25] drm/i915/slpc: Add broxton support tom.orourke
2016-04-06 19:24 ` [PATCH 21/25] drm/i915/slpc: Add i915_slpc_info to debugfs tom.orourke
2016-04-06 19:24 ` [PATCH 22/25] DO NOT MERGE: drm/i915/bxt: Add Broxton to guc loader tom.orourke
2016-04-06 19:24 ` [PATCH 23/25] DO NOT MERGE: drm/i915: resize the GuC WOPCM for rc6 tom.orourke
2016-04-07 6:33 ` Peter Antoine
2016-04-06 19:24 ` [PATCH 24/25] DO NOT MERGE: drm/i915: Enable GuC submission, where supported tom.orourke
2016-04-06 19:24 ` [PATCH 25/25] DO NOT MERGE: drm/i915: Enable SLPC, " tom.orourke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459970683-97940-13-git-send-email-tom.orourke@intel.com \
--to=tom.orourke@intel.com \
--cc=Tom.O'Rourke@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.org \
--cc=paulo.r.zanoni@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox