flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-08 16:36:14 +00:00
Code Issues Releases Wiki Activity

Revert "tests/gem_concurrent_blit: Fix segmentation fault"

Browse Source 
This reverts commit 912a7d855600aadb937517ec5bab26bfd9b8953d.

Now fixed for real!

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-08-26 20:41:00 +02:00
parent 8869e1e628
commit ad0f081f2b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/drmtest.c
View File

@ -654,8 +654,6 @@ static enum {
bool __igt_fixture(void) bool __igt_fixture(void)
{ {
assert(!in_fixture);
if (igt_only_list_subtests()) if (igt_only_list_subtests())
return false; return false;
@ -673,8 +671,6 @@ void __igt_fixture_complete(void)
void __igt_fixture_end(void) void __igt_fixture_end(void)
{ {
assert(in_fixture);
in_fixture = false; in_fixture = false;
longjmp(igt_subtest_jmpbuf, 1); longjmp(igt_subtest_jmpbuf, 1);
} }

4
tests/gem_concurrent_blit.c
View File

@ -333,11 +333,11 @@ run_basic_modes(struct access_mode *mode,
run_wrap_func(mode, src, dst, dummy, do_gpu_read_after_write); 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 static void
run_modes(struct access_mode *mode) run_modes(struct access_mode *mode)
{ {
drm_intel_bo *src[MAX_NUM_BUFFERS], *dst[MAX_NUM_BUFFERS], *dummy = NULL;
igt_fixture { igt_fixture {
bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
drm_intel_bufmgr_gem_enable_reuse(bufmgr); drm_intel_bufmgr_gem_enable_reuse(bufmgr);