[i-g-t,2/3] i915/gem_exec_fence: Allow GPU resets during hang checks
diff mbox series

Message ID 20191108142250.22709-2-chris@chris-wilson.co.uk
State New
Headers show
Series
  • [i-g-t,1/3] i915/gem_exec_fence: KMS master is not required
Related show

Commit Message

Chris Wilson Nov. 8, 2019, 2:22 p.m. UTC
The pair of *-hang-all will generate sufficient hangs for the kernel to
ban the client. This is unfortunate as it means all further tests are
skipped. Ask nicely not to be banned.

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

Comments

Tvrtko Ursulin Nov. 13, 2019, 10:51 a.m. UTC | #1
On 08/11/2019 14:22, Chris Wilson wrote:
> The pair of *-hang-all will generate sufficient hangs for the kernel to
> ban the client. This is unfortunate as it means all further tests are
> skipped. Ask nicely not to be banned.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   tests/i915/gem_exec_fence.c | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
> index d2d26a28b..4e8bdd7b3 100644
> --- a/tests/i915/gem_exec_fence.c
> +++ b/tests/i915/gem_exec_fence.c
> @@ -1522,6 +1522,8 @@ igt_main
>   	}
>   
>   	igt_subtest_group {
> +		igt_hang_t hang;
> +
>   		igt_fixture {
>   			igt_fork_hang_detector(i915);
>   		}
> @@ -1533,12 +1535,17 @@ igt_main
>   
>   		igt_fixture {
>   			igt_stop_hang_detector();
> +			hang = igt_allow_hang(i915, 0, 0);
>   		}
>   
>   		igt_subtest("busy-hang-all")
>   			test_fence_busy_all(i915, HANG);
>   		igt_subtest("wait-hang-all")
>   			test_fence_busy_all(i915, WAIT | HANG);
> +
> +		igt_fixture {
> +			igt_disallow_hang(i915, hang);
> +		}
>   	}
>   
>   	for (e = intel_execution_engines; e->name; e++) {
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko

Patch
diff mbox series

diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index d2d26a28b..4e8bdd7b3 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -1522,6 +1522,8 @@  igt_main
 	}
 
 	igt_subtest_group {
+		igt_hang_t hang;
+
 		igt_fixture {
 			igt_fork_hang_detector(i915);
 		}
@@ -1533,12 +1535,17 @@  igt_main
 
 		igt_fixture {
 			igt_stop_hang_detector();
+			hang = igt_allow_hang(i915, 0, 0);
 		}
 
 		igt_subtest("busy-hang-all")
 			test_fence_busy_all(i915, HANG);
 		igt_subtest("wait-hang-all")
 			test_fence_busy_all(i915, WAIT | HANG);
+
+		igt_fixture {
+			igt_disallow_hang(i915, hang);
+		}
 	}
 
 	for (e = intel_execution_engines; e->name; e++) {