All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: igt-dev@lists.freedesktop.org
Subject: [PATCH i-g-t 2/2] igt/drv_hangman: Skip if resets are disallowed
Date: Thu, 21 Feb 2019 10:19:44 +0000	[thread overview]
Message-ID: <20190221101944.19711-2-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20190221101944.19711-1-chris@chris-wilson.co.uk>

If we tell the machine to reset but they are disallowed, we will leave
the system in a wedged state, preventing the majority of subsequent
tests.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/i915_hangman.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
index df1e0afed..4e515e3a0 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -257,6 +257,7 @@ static void hangcheck_unterminated(void)
 igt_main
 {
 	const struct intel_execution_engine *e;
+	igt_hang_t hang = {};
 
 	igt_skip_on_simulation();
 
@@ -266,6 +267,8 @@ igt_main
 		device = drm_open_driver(DRIVER_INTEL);
 		igt_require_gem(device);
 
+		hang = igt_allow_hang(device, 0, HANG_ALLOW_CAPTURE);
+
 		sysfs = igt_sysfs_open(device, &idx);
 		igt_assert(sysfs != -1);
 
@@ -288,4 +291,8 @@ igt_main
 
 	igt_subtest("hangcheck-unterminated")
 		hangcheck_unterminated();
+
+	igt_fixture {
+		igt_disallow_hang(device, hang);
+	}
 }
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 2/2] igt/drv_hangman: Skip if resets are disallowed
Date: Thu, 21 Feb 2019 10:19:44 +0000	[thread overview]
Message-ID: <20190221101944.19711-2-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20190221101944.19711-1-chris@chris-wilson.co.uk>

If we tell the machine to reset but they are disallowed, we will leave
the system in a wedged state, preventing the majority of subsequent
tests.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/i915_hangman.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
index df1e0afed..4e515e3a0 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -257,6 +257,7 @@ static void hangcheck_unterminated(void)
 igt_main
 {
 	const struct intel_execution_engine *e;
+	igt_hang_t hang = {};
 
 	igt_skip_on_simulation();
 
@@ -266,6 +267,8 @@ igt_main
 		device = drm_open_driver(DRIVER_INTEL);
 		igt_require_gem(device);
 
+		hang = igt_allow_hang(device, 0, HANG_ALLOW_CAPTURE);
+
 		sysfs = igt_sysfs_open(device, &idx);
 		igt_assert(sysfs != -1);
 
@@ -288,4 +291,8 @@ igt_main
 
 	igt_subtest("hangcheck-unterminated")
 		hangcheck_unterminated();
+
+	igt_fixture {
+		igt_disallow_hang(device, hang);
+	}
 }
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  reply	other threads:[~2019-02-21 10:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-21 10:19 [PATCH i-g-t 1/2] lib: Only require we have i915.reset module parameter for allow-hang Chris Wilson
2019-02-21 10:19 ` [igt-dev] " Chris Wilson
2019-02-21 10:19 ` Chris Wilson [this message]
2019-02-21 10:19   ` [igt-dev] [PATCH i-g-t 2/2] igt/drv_hangman: Skip if resets are disallowed Chris Wilson
2019-02-21 16:11   ` Antonio Argenziano
2019-02-21 16:11     ` Antonio Argenziano
2019-02-21 11:42 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib: Only require we have i915.reset module parameter for allow-hang Patchwork
2019-02-21 16:08 ` [PATCH i-g-t 1/2] " Antonio Argenziano
2019-02-21 16:08   ` [igt-dev] [Intel-gfx] " Antonio Argenziano
2019-02-21 16:11   ` Chris Wilson
2019-02-21 16:11     ` [igt-dev] [Intel-gfx] " Chris Wilson
2019-02-21 16:16     ` Antonio Argenziano
2019-02-21 16:16       ` [igt-dev] [Intel-gfx] " Antonio Argenziano
2019-02-21 17:43 ` [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] " Patchwork

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=20190221101944.19711-2-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=igt-dev@lists.freedesktop.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.