diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-18 12:11:59 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-18 13:06:17 +0100 |
| commit | bc7877660c7d7a733ec484e91e2096b8daf2cf0d (patch) | |
| tree | 4ade2c9751497fac6a87081920863cce63d14704 /tests/prime_vgem.c | |
| parent | 49e083a29a0942309c877ea8e9275fa985a5bf25 (diff) | |
lib: Refactor testing for ability to use MI_STORE_DATA_IMM
Rather than have the code in multiple locations, put a copy in lib/
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/prime_vgem.c')
| -rw-r--r-- | tests/prime_vgem.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c index 44e5c65a..95557ef9 100644 --- a/tests/prime_vgem.c +++ b/tests/prime_vgem.c @@ -731,7 +731,6 @@ igt_main const struct intel_execution_engine *e; int i915 = -1; int vgem = -1; - int gen = 0; igt_skip_on_simulation(); @@ -743,7 +742,6 @@ igt_main igt_require_gem(i915); igt_require(has_prime_import(i915)); gem_require_mmap_wc(i915); - gen = intel_gen(intel_get_drm_devid(i915)); } igt_subtest("basic-read") @@ -760,9 +758,8 @@ igt_main e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); - igt_skip_on_f(gen == 6 && - e->exec_id == I915_EXEC_BSD, - "MI_STORE_DATA broken on gen6 bsd\n"); + igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags); + gem_quiescent_gpu(i915); test_sync(i915, vgem, e->exec_id, e->flags); } @@ -773,9 +770,8 @@ igt_main e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); - igt_skip_on_f(gen == 6 && - e->exec_id == I915_EXEC_BSD, - "MI_STORE_DATA broken on gen6 bsd\n"); + igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags); + gem_quiescent_gpu(i915); test_busy(i915, vgem, e->exec_id, e->flags); } @@ -786,9 +782,8 @@ igt_main e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); - igt_skip_on_f(gen == 6 && - e->exec_id == I915_EXEC_BSD, - "MI_STORE_DATA broken on gen6 bsd\n"); + igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags); + gem_quiescent_gpu(i915); test_wait(i915, vgem, e->exec_id, e->flags); } @@ -810,9 +805,8 @@ igt_main e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); - igt_skip_on_f(gen == 6 && - e->exec_id == I915_EXEC_BSD, - "MI_STORE_DATA broken on gen6 bsd\n"); + igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags); + gem_quiescent_gpu(i915); test_fence_wait(i915, vgem, e->exec_id, e->flags); } |