* [Intel-gfx] [PATCH i-g-t] lib/i915: Restore hangcheck modparams between tests
@ 2020-05-26 13:25 Chris Wilson
0 siblings, 0 replies; only message in thread
From: Chris Wilson @ 2020-05-26 13:25 UTC (permalink / raw)
To: intel-gfx; +Cc: igt-dev, Chris Wilson
The hangcheck/reset modparam has far reaching effects and disables
functionality if switch off. This can surprise a few tests causing them
to skip.
References: https://gitlab.freedesktop.org/drm/intel/-/issues/1929
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
lib/i915/gem.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lib/i915/gem.c b/lib/i915/gem.c
index 3ef31ed33..45db8a0fd 100644
--- a/lib/i915/gem.c
+++ b/lib/i915/gem.c
@@ -130,6 +130,13 @@ static void reset_device(int i915)
close(dir);
}
+static void restore_params(int i915)
+{
+ /* Re-enable modparams if left clobbered */
+ igt_params_set(i915, "reset", "%u", -1);
+ igt_params_set(i915, "enable_hangcheck", "%u", 1);
+}
+
void igt_require_gem(int i915)
{
int err;
@@ -150,6 +157,7 @@ void igt_require_gem(int i915)
* sequences of batches.
*/
reset_device(i915);
+ restore_params(i915);
restore_defaults(i915);
err = 0;
--
2.27.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-26 13:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 13:25 [Intel-gfx] [PATCH i-g-t] lib/i915: Restore hangcheck modparams between tests Chris Wilson
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).