From 4049adf01014af077df2174def4fadf7cecb066e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 30 Jan 2019 16:18:58 +0000 Subject: i915/gem_cpu_reloc: Do the can-store-dword check at start igt doesn't handle skipping from inside igt_fork very gracefully and crashes instead of reporting the lack of requirements. One solution would be to fix igt, but far easier is to just move the requirement checking around to do it before we even fork. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109493 Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- tests/i915/gem_cpu_reloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/i915/gem_cpu_reloc.c b/tests/i915/gem_cpu_reloc.c index 48cc7ddc..47099862 100644 --- a/tests/i915/gem_cpu_reloc.c +++ b/tests/i915/gem_cpu_reloc.c @@ -158,9 +158,6 @@ create_tmpl(int i915, struct drm_i915_gem_relocation_entry *reloc) struct drm_i915_gem_relocation_entry *reloc); void *tmpl; - /* could use BLT_FILL instead for gen2 */ - igt_require(gem_can_store_dword(i915, 0)); - if (gen >= 8) emit_store_addr = gen8_emit_store_addr; else if (gen >= 4) @@ -276,6 +273,9 @@ igt_main i915 = drm_open_driver(DRIVER_INTEL); igt_require_gem(i915); + /* could use BLT_FILL instead for gen2 */ + igt_require(gem_can_store_dword(i915, 0)); + igt_fork_hang_detector(i915); } -- cgit v1.2.3