diff mbox series

[i-g-t] i915/gem_render_copy: Add hang detector

Message ID 20190923092432.14793-1-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show
Series [i-g-t] i915/gem_render_copy: Add hang detector | expand

Commit Message

Chris Wilson Sept. 23, 2019, 9:24 a.m. UTC
Die early if the GPU hangs during our basic render copy testing, and
clean up rather than waiting for multiple different failing batches
before detecting our failure.

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

Comments

Ville Syrjala Sept. 23, 2019, 2:48 p.m. UTC | #1
On Mon, Sep 23, 2019 at 10:24:32AM +0100, Chris Wilson wrote:
> Die early if the GPU hangs during our basic render copy testing, and
> clean up rather than waiting for multiple different failing batches
> before detecting our failure.

Seems sensible.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  tests/i915/gem_render_copy.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
> index b8149483c..261833d24 100644
> --- a/tests/i915/gem_render_copy.c
> +++ b/tests/i915/gem_render_copy.c
> @@ -715,6 +715,8 @@ igt_main_args("da", NULL, help_str, opt_handler, NULL)
>  
>  		data.batch = intel_batchbuffer_alloc(data.bufmgr, data.devid);
>  		igt_assert(data.batch);
> +
> +		igt_fork_hang_detector(data.drm_fd);
>  	}
>  
>  	igt_subtest("linear")
> @@ -745,6 +747,7 @@ igt_main_args("da", NULL, help_str, opt_handler, NULL)
>  		test(&data, I915_TILING_Yf, I915_TILING_Yf);
>  
>  	igt_fixture {
> +		igt_stop_hang_detector();
>  		intel_batchbuffer_free(data.batch);
>  		drm_intel_bufmgr_destroy(data.bufmgr);
>  	}
> -- 
> 2.23.0
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
diff mbox series

Patch

diff --git a/tests/i915/gem_render_copy.c b/tests/i915/gem_render_copy.c
index b8149483c..261833d24 100644
--- a/tests/i915/gem_render_copy.c
+++ b/tests/i915/gem_render_copy.c
@@ -715,6 +715,8 @@  igt_main_args("da", NULL, help_str, opt_handler, NULL)
 
 		data.batch = intel_batchbuffer_alloc(data.bufmgr, data.devid);
 		igt_assert(data.batch);
+
+		igt_fork_hang_detector(data.drm_fd);
 	}
 
 	igt_subtest("linear")
@@ -745,6 +747,7 @@  igt_main_args("da", NULL, help_str, opt_handler, NULL)
 		test(&data, I915_TILING_Yf, I915_TILING_Yf);
 
 	igt_fixture {
+		igt_stop_hang_detector();
 		intel_batchbuffer_free(data.batch);
 		drm_intel_bufmgr_destroy(data.bufmgr);
 	}