From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/7] drm/i915: Update i915.reset to handle engine resets
Date: Mon, 19 Sep 2016 16:30:13 +0100 [thread overview]
Message-ID: <1474299019-26430-1-git-send-email-matthew.auld@intel.com> (raw)
From: "arun.siluvery@linux.intel.com" <arun.siluvery@linux.intel.com>
In preparation for engine reset work update this parameter to handle more
than one type of reset. Default at the moment is still full gpu reset.
v2
- rebase
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/i915_params.c | 6 +++---
drivers/gpu/drm/i915/i915_params.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 768ad89..a945ec1 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -46,7 +46,7 @@ struct i915_params i915 __read_mostly = {
.prefault_disable = 0,
.load_detect_test = 0,
.force_reset_modeset_test = 0,
- .reset = true,
+ .reset = 1,
.invert_brightness = 0,
.disable_display = 0,
.enable_cmd_parser = 1,
@@ -112,8 +112,8 @@ MODULE_PARM_DESC(vbt_sdvo_panel_type,
"Override/Ignore selection of SDVO panel mode in the VBT "
"(-2=ignore, -1=auto [default], index in VBT BIOS table)");
-module_param_named_unsafe(reset, i915.reset, bool, 0600);
-MODULE_PARM_DESC(reset, "Attempt GPU resets (default: true)");
+module_param_named_unsafe(reset, i915.reset, int, 0600);
+MODULE_PARM_DESC(reset, "Attempt GPU resets (0=disabled, 1=full gpu reset [default], 2=engine reset)");
module_param_named_unsafe(enable_hangcheck, i915.enable_hangcheck, bool, 0644);
MODULE_PARM_DESC(enable_hangcheck,
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 3a0dd78..2f188bb 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -34,6 +34,7 @@ struct i915_params {
int lvds_channel_mode;
int panel_use_ssc;
int vbt_sdvo_panel_type;
+ int reset;
int enable_rc6;
int enable_dc;
int enable_fbc;
@@ -58,7 +59,6 @@ struct i915_params {
bool prefault_disable;
bool load_detect_test;
bool force_reset_modeset_test;
- bool reset;
bool disable_display;
bool verbose_state_checks;
bool nuclear_pageflip;
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-09-19 15:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 15:30 Matthew Auld [this message]
2016-09-19 15:30 ` [PATCH 2/7] drm/i915/tdr: Modify error handler for per engine hang recovery Matthew Auld
2016-09-19 19:52 ` Chris Wilson
2016-09-19 15:30 ` [PATCH 3/7] drm/i915/tdr: Add support for per engine reset recovery Matthew Auld
2016-09-19 19:53 ` Chris Wilson
2016-09-19 15:30 ` [PATCH 4/7] drm/i915: Skip reset request if there is one already Matthew Auld
2016-09-19 15:30 ` [PATCH 5/7] drm/i915/tdr: Add engine reset count to error state Matthew Auld
2016-09-19 15:30 ` [PATCH 6/7] drm/i915/tdr: Export reset count info to debugfs Matthew Auld
2016-09-19 15:30 ` [PATCH 7/7] drm/i915/tdr: Enable Engine reset and recovery support Matthew Auld
2016-09-19 16:00 ` [PATCH 1/7] drm/i915: Update i915.reset to handle engine resets Joonas Lahtinen
2016-09-19 16:50 ` ✗ Fi.CI.BAT: failure for series starting with [1/7] " Patchwork
2016-09-19 19:55 ` [PATCH 1/7] " Chris Wilson
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=1474299019-26430-1-git-send-email-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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;
as well as URLs for NNTP newsgroup(s).