From patchwork Tue Nov 5 10:57:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 3140281 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BF1149F3C4 for ; Tue, 5 Nov 2013 11:02:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0828F2060A for ; Tue, 5 Nov 2013 11:02:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id F3D86205F5 for ; Tue, 5 Nov 2013 11:02:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF8A7112A85; Tue, 5 Nov 2013 03:02:20 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DEF7112A82 for ; Tue, 5 Nov 2013 03:02:18 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 05 Nov 2013 02:58:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,535,1378882800"; d="scan'208";a="430001220" Received: from omateolo-haswell.isw.intel.com ([10.102.226.164]) by orsmga002.jf.intel.com with ESMTP; 05 Nov 2013 03:02:16 -0800 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Tue, 5 Nov 2013 10:57:31 +0000 Message-Id: <1383649051-6289-1-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383582649-2841-4-git-send-email-oscar.mateo@intel.com> References: <1383582649-2841-4-git-send-email-oscar.mateo@intel.com> Subject: [Intel-gfx] [PATCH 4/4 v2] gem_flink_race: Assure no pending requests before object counting X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Mateo 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 --- tests/gem_flink_race.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c index b81007e..195ec15 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));