From patchwork Sun Mar 23 14:18:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3879151 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3546CBF540 for ; Sun, 23 Mar 2014 14:19:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6131F201F4 for ; Sun, 23 Mar 2014 14:19:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8FFFF201B4 for ; Sun, 23 Mar 2014 14:19:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C24B6E6B6; Sun, 23 Mar 2014 07:19:46 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com [74.125.83.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 652716E6AF for ; Sun, 23 Mar 2014 07:19:44 -0700 (PDT) Received: by mail-ee0-f48.google.com with SMTP id b57so3488049eek.7 for ; Sun, 23 Mar 2014 07:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dtYhgSy0Klho54Rm02WLZfILHNr3toILn3hQSTgptDA=; b=GNpcEq2/DqaJFII2nVXIBWHiRvFGsp5fTD1aGxWCQgDP25tFh0RRTc2Ujzmf+m9WNE wM03g4Wd9BRo9zJt4a5iEZdsLQoHgEBphk+VHA72y5XL3FwqsrjeyzfGGCbPouwVkKlS 7WkGvobFJ3AtJvreTq7TElJAquYwsKMslBfSM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dtYhgSy0Klho54Rm02WLZfILHNr3toILn3hQSTgptDA=; b=KGnEJJguAFsYjFXi9zsBITotl5fQcHhnyw0vxFz8Ts3ptqohs1qEhgK98OFo02uQis vi3DnYqO133I3D6DrbJitcVWu8wxTGqrVlUHbuIg4biaG4RtlnPmnMxjBHTXwec123k1 6qOazIony4iliF7zWveXAWH4fcF3CHPsBGrDdOxOAEkAM9j0j2Shh/kZj3I97HYHwjEP CWKVbAKp2sw25agYFiV/cFD0fX+d0k8lCCv7xqauPYIkiKksxX0rokNWlxekKWdzVDmk j3E906KCUj9ZXS591UNtJYLs9B4Ved+3fyQsKiFoZKDTisrtoAj6MJOq9LoJ/QJF4zqp e1Mg== X-Gm-Message-State: ALoCoQlplv3ZYlqJ2OFPSeinhSKlIYz1zTJejmgdYjf+GLCfTldjXUl1qAQskaAqvAdM6XWLu2SJ X-Received: by 10.14.127.132 with SMTP id d4mr58176eei.84.1395584383702; Sun, 23 Mar 2014 07:19:43 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id cb5sm26392589eeb.18.2014.03.23.07.19.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Mar 2014 07:19:42 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 23 Mar 2014 15:18:56 +0100 Message-Id: <1395584342-11812-23-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch> References: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 22/28] lib: s/drmtest_dumb_aub/igt_aub_dump_enabled/ X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This is prep work to extract a new igt aux library with all kinds of random stuff. Also give it a bit a more suitable name to indicate that this is just a flag and doesn't do the aub dumping itself. Signed-off-by: Daniel Vetter --- lib/drmtest.c | 2 +- lib/drmtest.h | 2 +- lib/rendercopy_gen8.c | 2 +- tests/gem_render_copy.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index 3c72ac8dba2c..9fcd221be450 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -329,7 +329,7 @@ bool igt_env_set(const char *env_var, bool default_value) return atoi(val) != 0; } -bool drmtest_dump_aub(void) +bool igt_aub_dump_enabled(void) { static int dump_aub = -1; diff --git a/lib/drmtest.h b/lib/drmtest.h index 97d60d0c29dd..0985109b5247 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -66,7 +66,7 @@ void igt_permute_array(void *array, unsigned size, void igt_progress(const char *header, uint64_t i, uint64_t total); bool igt_env_set(const char *env_var, bool default_value); -bool drmtest_dump_aub(void); +bool igt_aub_dump_enabled(void); /* helpers based upon the libdrm buffer manager */ void igt_init_aperture_trashers(drm_intel_bufmgr *bufmgr); diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c index 424afa0aefa8..02333cfd8461 100644 --- a/lib/rendercopy_gen8.c +++ b/lib/rendercopy_gen8.c @@ -120,7 +120,7 @@ static void annotation_add_state(struct annotations_context *ctx, static void annotation_flush(struct annotations_context *ctx, struct intel_batchbuffer *batch) { - if (!drmtest_dump_aub()) + if (!igt_aub_dump_enabled()) return; drm_intel_bufmgr_gem_set_aub_annotations(batch->bo, diff --git a/tests/gem_render_copy.c b/tests/gem_render_copy.c index 12ac18d31251..86ae64385351 100644 --- a/tests/gem_render_copy.c +++ b/tests/gem_render_copy.c @@ -127,7 +127,7 @@ int main(int argc, char **argv) igt_render_copyfunc_t render_copy = NULL; int opt; int opt_dump_png = false; - int opt_dump_aub = drmtest_dump_aub(); + int opt_dump_aub = igt_aub_dump_enabled(); igt_simple_init();