gem_flink_race: Assure no pending requests before object counting
authorOscar Mateo <oscar.mateo@intel.com>
Tue, 5 Nov 2013 10:57:31 +0000 (10:57 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 5 Nov 2013 11:30:40 +0000 (12:30 +0100)
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>
tests/gem_flink_race.c

index b81007e..195ec15 100644 (file)
@@ -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));