From 6ddc1a143495baa68dbc909f2a8819ec03c31c8e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 15 Sep 2019 10:24:41 +0100 Subject: i915: More gem_require_blitter() Some more tests that used the less common blt interfaces. Signed-off-by: Chris Wilson Acked-by: Mika Kuoppala --- tests/i915/gem_bad_reloc.c | 1 + tests/i915/gem_caching.c | 1 + tests/i915/gem_double_irq_loop.c | 2 ++ tests/i915/gem_exec_blt.c | 1 + tests/i915/gem_partial_pwrite_pread.c | 1 + tests/i915/gem_pipe_control_store_loop.c | 1 + tests/i915/gem_pwrite_pread.c | 1 + tests/i915/gem_pwrite_snooped.c | 1 + tests/i915/gem_unfence_active_buffers.c | 1 + tests/i915/gem_unref_active_buffers.c | 1 + tests/i915/i915_pm_rpm.c | 1 + 11 files changed, 12 insertions(+) diff --git a/tests/i915/gem_bad_reloc.c b/tests/i915/gem_bad_reloc.c index 7624cd8e..c03e5beb 100644 --- a/tests/i915/gem_bad_reloc.c +++ b/tests/i915/gem_bad_reloc.c @@ -191,6 +191,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); } for (e = intel_execution_engines; e->name; e++) { diff --git a/tests/i915/gem_caching.c b/tests/i915/gem_caching.c index 09e1a5f9..ce9e6345 100644 --- a/tests/i915/gem_caching.c +++ b/tests/i915/gem_caching.c @@ -114,6 +114,7 @@ igt_main fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); gem_require_caching(fd); devid = intel_get_drm_devid(fd); diff --git a/tests/i915/gem_double_irq_loop.c b/tests/i915/gem_double_irq_loop.c index bf69f5ee..b326fc58 100644 --- a/tests/i915/gem_double_irq_loop.c +++ b/tests/i915/gem_double_irq_loop.c @@ -97,6 +97,8 @@ igt_simple_main fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); + devid = intel_get_drm_devid(fd); igt_require_f(HAS_BLT_RING(devid), "not (yet) implemented for pre-snb\n"); diff --git a/tests/i915/gem_exec_blt.c b/tests/i915/gem_exec_blt.c index 94de1a82..ffb60d0c 100644 --- a/tests/i915/gem_exec_blt.c +++ b/tests/i915/gem_exec_blt.c @@ -312,6 +312,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); sysfs = igt_sysfs_open(fd); igt_require(sysfs >= 0); diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/i915/gem_partial_pwrite_pread.c index 35e39ad7..49e086ed 100644 --- a/tests/i915/gem_partial_pwrite_pread.c +++ b/tests/i915/gem_partial_pwrite_pread.c @@ -253,6 +253,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); devid = intel_get_drm_devid(fd); diff --git a/tests/i915/gem_pipe_control_store_loop.c b/tests/i915/gem_pipe_control_store_loop.c index db23e33d..b8a21d78 100644 --- a/tests/i915/gem_pipe_control_store_loop.c +++ b/tests/i915/gem_pipe_control_store_loop.c @@ -162,6 +162,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); devid = intel_get_drm_devid(fd); diff --git a/tests/i915/gem_pwrite_pread.c b/tests/i915/gem_pwrite_pread.c index 3a58eae6..422db34d 100644 --- a/tests/i915/gem_pwrite_pread.c +++ b/tests/i915/gem_pwrite_pread.c @@ -285,6 +285,7 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL) fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); dst = gem_create(fd, object_size); src = gem_create(fd, object_size); diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/i915/gem_pwrite_snooped.c index 47ccce8b..80f590de 100644 --- a/tests/i915/gem_pwrite_snooped.c +++ b/tests/i915/gem_pwrite_snooped.c @@ -131,6 +131,7 @@ igt_simple_main fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); devid = intel_get_drm_devid(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); diff --git a/tests/i915/gem_unfence_active_buffers.c b/tests/i915/gem_unfence_active_buffers.c index b78fbafa..a357ec32 100644 --- a/tests/i915/gem_unfence_active_buffers.c +++ b/tests/i915/gem_unfence_active_buffers.c @@ -75,6 +75,7 @@ igt_simple_main fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); drm_intel_bufmgr_gem_enable_reuse(bufmgr); diff --git a/tests/i915/gem_unref_active_buffers.c b/tests/i915/gem_unref_active_buffers.c index 4fafdd04..b5d48206 100644 --- a/tests/i915/gem_unref_active_buffers.c +++ b/tests/i915/gem_unref_active_buffers.c @@ -58,6 +58,7 @@ igt_simple_main fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); + gem_require_blitter(fd); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); igt_assert(bufmgr); diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c index 2168ff72..f6749275 100644 --- a/tests/i915/i915_pm_rpm.c +++ b/tests/i915/i915_pm_rpm.c @@ -1266,6 +1266,7 @@ static void gem_execbuf_subtest(void) uint32_t color; igt_require_gem(drm_fd); + gem_require_blitter(drm_fd); /* Create and set data while the device is active. */ enable_one_screen_and_wait(&ms_data); -- cgit v1.2.3