diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-04-03 12:02:17 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-04-03 12:03:15 +0100 |
| commit | 537e0b848660c65b9d235f5576f29ddea3629b07 (patch) | |
| tree | 3595ad91b02523da713f99ea94cb9e4890f45bbd /tests | |
| parent | 9f92893b11e83ed9ec71c3084ccb57f74b18705e (diff) | |
tests: More precautionary selfchecks to filter out broken GPUs
If the driver is already wedged, trying to use GEM will only result in
misleading failure.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gem_caching.c | 1 | ||||
| -rw-r--r-- | tests/gem_exec_blt.c | 2 | ||||
| -rw-r--r-- | tests/gem_hangcheck_forcewake.c | 1 | ||||
| -rw-r--r-- | tests/gem_media_fill.c | 2 | ||||
| -rw-r--r-- | tests/gem_partial_pwrite_pread.c | 1 | ||||
| -rw-r--r-- | tests/gem_persistent_relocs.c | 1 | ||||
| -rw-r--r-- | tests/gem_pipe_control_store_loop.c | 2 | ||||
| -rw-r--r-- | tests/gem_pread_after_blit.c | 1 |
8 files changed, 11 insertions, 0 deletions
diff --git a/tests/gem_caching.c b/tests/gem_caching.c index 2ef364d5..7a9f03aa 100644 --- a/tests/gem_caching.c +++ b/tests/gem_caching.c @@ -116,6 +116,7 @@ igt_main fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); gem_require_caching(fd); devid = intel_get_drm_devid(fd); diff --git a/tests/gem_exec_blt.c b/tests/gem_exec_blt.c index 932884b0..8c0453f6 100644 --- a/tests/gem_exec_blt.c +++ b/tests/gem_exec_blt.c @@ -192,6 +192,8 @@ static void run(int object_size, bool dumb) int ring; fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); + if (dumb) handle = kmstest_dumb_create(fd, 32, 32, 32, NULL, NULL); else diff --git a/tests/gem_hangcheck_forcewake.c b/tests/gem_hangcheck_forcewake.c index 16f2167f..a3e7554c 100644 --- a/tests/gem_hangcheck_forcewake.c +++ b/tests/gem_hangcheck_forcewake.c @@ -69,6 +69,7 @@ igt_simple_main memset(blob, 'A', sizeof(blob)); fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); drm_intel_bufmgr_gem_enable_reuse(bufmgr); diff --git a/tests/gem_media_fill.c b/tests/gem_media_fill.c index 2c522607..72540a25 100644 --- a/tests/gem_media_fill.c +++ b/tests/gem_media_fill.c @@ -104,6 +104,8 @@ igt_simple_main int i, j; data.drm_fd = drm_open_driver_render(DRIVER_INTEL); + igt_require_em(data.drm_fd); + data.devid = intel_get_drm_devid(data.drm_fd); data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096); diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c index bc63910b..043916ce 100644 --- a/tests/gem_partial_pwrite_pread.c +++ b/tests/gem_partial_pwrite_pread.c @@ -255,6 +255,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); //drm_intel_bufmgr_gem_enable_reuse(bufmgr); diff --git a/tests/gem_persistent_relocs.c b/tests/gem_persistent_relocs.c index e51420e1..bc831ee4 100644 --- a/tests/gem_persistent_relocs.c +++ b/tests/gem_persistent_relocs.c @@ -323,6 +323,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); /* disable reuse, otherwise the test fails */ diff --git a/tests/gem_pipe_control_store_loop.c b/tests/gem_pipe_control_store_loop.c index a155ad14..db23e33d 100644 --- a/tests/gem_pipe_control_store_loop.c +++ b/tests/gem_pipe_control_store_loop.c @@ -161,6 +161,8 @@ igt_main { igt_fixture { fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); + devid = intel_get_drm_devid(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/gem_pread_after_blit.c b/tests/gem_pread_after_blit.c index 79ad8bc7..6ef3ca20 100644 --- a/tests/gem_pread_after_blit.c +++ b/tests/gem_pread_after_blit.c @@ -212,6 +212,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); + igt_require_gem(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); drm_intel_bufmgr_gem_enable_reuse(bufmgr); |