diff mbox series

[i-g-t,2/8] i915/gem_eio: Check for allow-hang prior to issuing a reset

Message ID 20190130095500.23596-2-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show
Series [i-g-t,1/8] lib: Skip unused fork helpers | expand

Commit Message

Chris Wilson Jan. 30, 2019, 9:54 a.m. UTC
Check that we are allowed to hang/reset the GPU before we actually do so
for the first time.

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

Comments

Mika Kuoppala Jan. 30, 2019, 11:08 a.m. UTC | #1
Chris Wilson <chris@chris-wilson.co.uk> writes:

> Check that we are allowed to hang/reset the GPU before we actually do so
> for the first time.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

> ---
>  tests/i915/gem_eio.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c
> index 5250a414c..09059c311 100644
> --- a/tests/i915/gem_eio.c
> +++ b/tests/i915/gem_eio.c
> @@ -745,14 +745,14 @@ igt_main
>  		fd = drm_open_driver(DRIVER_INTEL);
>  		igt_device_drop_master(fd);
>  
> -		igt_require(i915_reset_control(true));
> -		igt_force_gpu_reset(fd);
> -		igt_install_exit_handler(exit_handler);
> -
>  		gem_submission_print_method(fd);
>  		igt_require_gem(fd);
>  
>  		igt_allow_hang(fd, 0, 0);
> +
> +		igt_require(i915_reset_control(true));
> +		igt_force_gpu_reset(fd);
> +		igt_install_exit_handler(exit_handler);
>  	}
>  
>  	igt_subtest("throttle")
> -- 
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c
index 5250a414c..09059c311 100644
--- a/tests/i915/gem_eio.c
+++ b/tests/i915/gem_eio.c
@@ -745,14 +745,14 @@  igt_main
 		fd = drm_open_driver(DRIVER_INTEL);
 		igt_device_drop_master(fd);
 
-		igt_require(i915_reset_control(true));
-		igt_force_gpu_reset(fd);
-		igt_install_exit_handler(exit_handler);
-
 		gem_submission_print_method(fd);
 		igt_require_gem(fd);
 
 		igt_allow_hang(fd, 0, 0);
+
+		igt_require(i915_reset_control(true));
+		igt_force_gpu_reset(fd);
+		igt_install_exit_handler(exit_handler);
 	}
 
 	igt_subtest("throttle")