diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-20 06:39:43 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-20 06:42:10 +0200 |
commit | 912a7d855600aadb937517ec5bab26bfd9b8953d (patch) | |
tree | 6832b116cd7f443dc0a16f9aacd092d4378a2d4e /tests | |
parent | 00282ed4589491732e921b66166ffa72e3ae11f3 (diff) |
tests/gem_concurrent_blit: Fix segmentation fault
Apparently the simple changes introduced in
commit 78865847f9fae7e590960f9836f2ec8b611a190e
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
AuthorDate: Mon Aug 19 07:23:49 2013 +0200
Commit: Daniel Vetter <daniel.vetter@ffwll.ch>
CommitDate: Mon Aug 19 08:09:25 2013 +0200
lib/drmtest: skip fixtures after an igt_skip
pushed the stack space requirement for run_modes over some magic limit
(I guess where the strack grow logic starts to fail, but I didn't
check). Fix this by moving the data into .bss.
Also add some asserts to check that fixtures aren't abused while at
it (i.e. the useful parts of my debug printf/assert craze).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68299
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gem_concurrent_blit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c index 69477748..d9ef5b56 100644 --- 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); |