[PATCH i-g-t 1/2] igt/gem_gpgpu_fill: Check for GEM before use

[PATCH i-g-t 1/2] igt/gem_gpgpu_fill: Check for GEM before use

[Chris Wilson]

As we need GEM and the GPU to do a GPGPU fill, we should check that it
is operable before using -- skipping rather than failing when the device
is wedged.

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

diff --git a/tests/gem_gpgpu_fill.c b/tests/gem_gpgpu_fill.c
index 8ef05a3f0..dfb581652 100644
--- a/tests/gem_gpgpu_fill.c
+++ b/tests/gem_gpgpu_fill.c
@@ -104,6 +104,7 @@ igt_simple_main
 
 	data.drm_fd = drm_open_driver_render(DRIVER_INTEL);
 	data.devid = intel_get_drm_devid(data.drm_fd);
+	igt_require_gem(data.drm_fd);
 
 	data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
 	igt_assert(data.bufmgr);
-- 
2.18.0

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

[PATCH i-g-t 2/2] lib/gt: Check GEM is operation before injecting a hang

[Chris Wilson]

To inject a hang, we execute a spinning batch. This means we require GEM
to be operation before the hang, so check.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/igt_gt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 89b318ae6..86c6e1972 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -118,6 +118,7 @@ void igt_require_hang_ring(int fd, int ring)
 	if (!igt_check_boolean_env_var("IGT_HANG", true))
 		igt_skip("hang injection disabled by user");
 
+	igt_require_gem(fd);
 	gem_require_ring(fd, ring);
 	gem_context_require_bannable(fd);
 	if (!igt_check_boolean_env_var("IGT_HANG_WITHOUT_RESET", false))
-- 
2.18.0

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

Re: [PATCH i-g-t 1/2] igt/gem_gpgpu_fill: Check for GEM before use

[Ville Syrjälä]

On Thu, Jul 12, 2018 at 04:37:08PM +0100, Chris Wilson wrote:
> As we need GEM and the GPU to do a GPGPU fill, we should check that it
> is operable before using -- skipping rather than failing when the device
> is wedged.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

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

> ---
>  tests/gem_gpgpu_fill.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/gem_gpgpu_fill.c b/tests/gem_gpgpu_fill.c
> index 8ef05a3f0..dfb581652 100644
> --- a/tests/gem_gpgpu_fill.c
> +++ b/tests/gem_gpgpu_fill.c
> @@ -104,6 +104,7 @@ igt_simple_main
>  
>  	data.drm_fd = drm_open_driver_render(DRIVER_INTEL);
>  	data.devid = intel_get_drm_devid(data.drm_fd);
> +	igt_require_gem(data.drm_fd);
>  
>  	data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
>  	igt_assert(data.bufmgr);
> -- 
> 2.18.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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