diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-03 16:32:52 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-03 16:32:52 +0100 |
| commit | aee0dcb1ec2075991d310dd6f3fb5e50160847d1 (patch) | |
| tree | 18bc4959d72c0616621cb24704767bba878fc134 | |
| parent | 26b336f81128b6c51e2757381c19d8cdf0b2c369 (diff) | |
test/gem_concurrent_blt
Limit working set size also with available ram.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72255
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | lib/drmtest.c | 4 | ||||
| -rw-r--r-- | tests/gem_concurrent_blit.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c index 94fa6861..eeab5e64 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -1127,7 +1127,6 @@ static void fork_helper_exit_handler(int sig) bool __igt_fork_helper(struct igt_helper_process *proc) { pid_t pid; - sighandler_t oldsig; int id; assert(!proc->running); @@ -1144,7 +1143,6 @@ bool __igt_fork_helper(struct igt_helper_process *proc) * that inserting sufficient amounts of printf or other delays makes * this unnecessary. */ - oldsig = signal(SIGQUIT, SIG_DFL); switch (pid = fork()) { case -1: igt_assert(0); @@ -1155,8 +1153,6 @@ bool __igt_fork_helper(struct igt_helper_process *proc) return true; default: - signal(SIGQUIT, oldsig); - proc->running = true; proc->pid = pid; proc->id = id; diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c index fb56c257..27bc795f 100644 --- a/tests/gem_concurrent_blit.c +++ b/tests/gem_concurrent_blit.c @@ -366,6 +366,10 @@ igt_main max = gem_aperture_size (fd) / (1024 * 1024) / 2; if (num_buffers > max) num_buffers = max; + + max = intel_get_total_ram_mb() * 3 / 4; + if (num_buffers > max) + num_buffers = max; } for (i = 0; i < ARRAY_SIZE(access_modes); i++) |