Revert "tests/gem_concurrent_blit: Fix segmentation fault"

This reverts commit 912a7d855600aadb937517ec5bab26bfd9b8953d.

Now fixed for real!

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 6247ef5..ed249f9 100644 (file)
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -654,8 +654,6 @@ static enum {
 
 bool __igt_fixture(void)
 {
-       assert(!in_fixture);
-
        if (igt_only_list_subtests())
                return false;
 
@@ -673,8 +671,6 @@ void __igt_fixture_complete(void)
 
 void __igt_fixture_end(void)
 {
-       assert(in_fixture);
-
        in_fixture = false;
        longjmp(igt_subtest_jmpbuf, 1);
 }

diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c
index d9ef5b5..6947774 100644 (file)
--- a/tests/gem_concurrent_blit.c
+++ b/tests/gem_concurrent_blit.c
@@ -333,11 +333,11 @@ run_basic_modes(struct access_mode *mode,
                run_wrap_func(mode, src, dst, dummy, do_gpu_read_after_write);
 }
 
-drm_intel_bo *src[MAX_NUM_BUFFERS], *dst[MAX_NUM_BUFFERS], *dummy = NULL;
-
 static void
 run_modes(struct access_mode *mode)
 {
+       drm_intel_bo *src[MAX_NUM_BUFFERS], *dst[MAX_NUM_BUFFERS], *dummy = NULL;
+
        igt_fixture {
                bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
                drm_intel_bufmgr_gem_enable_reuse(bufmgr);