From patchwork Tue May 16 13:25:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadiusz Hiler X-Patchwork-Id: 9729223 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5D0EE602B4 for ; Tue, 16 May 2017 13:25:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5044C28653 for ; Tue, 16 May 2017 13:25:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4555628A25; Tue, 16 May 2017 13:25:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0DE6628653 for ; Tue, 16 May 2017 13:25:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF5D989A9B; Tue, 16 May 2017 13:25:50 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08DF56E316 for ; Tue, 16 May 2017 13:25:45 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP; 16 May 2017 06:25:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,349,1491289200"; d="scan'208";a="87981705" Received: from ahiler-desk.igk.intel.com ([172.28.171.131]) by orsmga004.jf.intel.com with ESMTP; 16 May 2017 06:25:44 -0700 From: Arkadiusz Hiler To: intel-gfx@lists.freedesktop.org Date: Tue, 16 May 2017 15:25:02 +0200 Message-Id: <20170516132502.9772-14-arkadiusz.hiler@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170516132502.9772-1-arkadiusz.hiler@intel.com> References: <20170516132502.9772-1-arkadiusz.hiler@intel.com> Organization: Intel Technology Poland sp. z o.o. - KRS 101882 - ul. Slowackiego 173, 80-298 Gdansk Subject: [Intel-gfx] [PATCH i-g-t 13/13] tests/gem_exec_nop: Rename signal() to fence_signal() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Unfortunately is included through some obscure dependencies when using bionic, so we have a name clash on signal(). Changed the test function name to fence_signal() to avoid this, but left the test cases names unchanged. Signed-off-by: Arkadiusz Hiler --- tests/gem_exec_nop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c index d96f068..d61e120 100644 --- a/tests/gem_exec_nop.c +++ b/tests/gem_exec_nop.c @@ -517,9 +517,9 @@ static bool fence_wait(int fence) return poll(&(struct pollfd){fence, POLLIN}, 1, -1) == 1; } -static void signal(int fd, uint32_t handle, - unsigned ring_id, const char *ring_name, - int timeout) +static void fence_signal(int fd, uint32_t handle, + unsigned ring_id, const char *ring_name, + int timeout) { #define NFENCES 512 struct drm_i915_gem_execbuffer2 execbuf; @@ -659,11 +659,11 @@ igt_main igt_subtest_f("%s", e->name) single(device, handle, e->exec_id | e->flags, e->name); igt_subtest_f("signal-%s", e->name) - signal(device, handle, e->exec_id | e->flags, e->name, 5); + fence_signal(device, handle, e->exec_id | e->flags, e->name, 5); } igt_subtest("signal-all") - signal(device, handle, -1, "all", 150); + fence_signal(device, handle, -1, "all", 150); igt_subtest("series") series(device, handle, 150);