summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOscar Mateo <oscar.mateo@intel.com>2013-11-05 10:57:31 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-05 12:30:40 +0100
commit466da453aee6bc6218b5f7ebf22223c269c176b7 (patch)
tree6e7e4878f691888dbbb08fc1e511d25cc6371220
parentece21fa86502352a251d313dc22b325ac57f2ee4 (diff)
gem_flink_race: Assure no pending requests before object counting
Same thing that was done for prime_self_import. v2: Move igt_drop_caches_set() call inside get_object_count() to make it clearer why we want this. Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--tests/gem_flink_race.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c
index b81007e5..195ec151 100644
--- a/tests/gem_flink_race.c
+++ b/tests/gem_flink_race.c
@@ -35,6 +35,7 @@
#include "drmtest.h"
#include "i915_drm.h"
#include "intel_bufmgr.h"
+#include "igt_debugfs.h"
/* Testcase: check for flink/open vs. gem close races
*
@@ -54,6 +55,8 @@ static int get_object_count(void)
int device = drm_get_card();
char *path;
+ igt_drop_caches_set(DROP_RETIRE);
+
ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device);
igt_assert(ret != -1);
@@ -157,9 +160,11 @@ static void test_flink_close(void)
{
pthread_t *threads;
int r, i, num_threads;
- int obj_count = get_object_count();
+ int obj_count;
void *status;
+ obj_count = get_object_count();
+
num_threads = sysconf(_SC_NPROCESSORS_ONLN);
threads = calloc(num_threads, sizeof(pthread_t));