From patchwork Wed Nov 9 16:15:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 9419747 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 4ECED601C0 for ; Wed, 9 Nov 2016 16:16:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43A95289E5 for ; Wed, 9 Nov 2016 16:16:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38C9128AD0; Wed, 9 Nov 2016 16:16:53 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID 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 D9278289E5 for ; Wed, 9 Nov 2016 16:16:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 688866E6EB; Wed, 9 Nov 2016 16:16:52 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3ECDB6E6EB for ; Wed, 9 Nov 2016 16:16:50 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id a20so19467627wme.2 for ; Wed, 09 Nov 2016 08:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=DGJUkxBEkPKQX2syIPkzi+3YLnncykR5nw5fG/RfPp0=; b=tuIeHnOGAvQVPfDyLWhPL1AG7y31A3l/GEPYMhJhk4ItwQwudmFnj4OUobrpmXr39H 3fFw6/cFVsBazMxfPSycfpKgXp1L+DFhU6emeb7CZ3rXPY67+40TpvgYdywbfEN7ddkm G5nhzDP6B1RZsdyi01ZEioKhCnluypYsrArugGlZS9fpz9P9FmNR8Epi9bnF+3IW723n 2OyByclJjtXM7PH7ULIPcy4eSm0xNv+fByJi2Ea23JIknqwecRD1seq6aQ7b2aLmp4tn CoPEk4I5j/HusqEM8OqwKyTe7OpPo/51rJ83ECZUSsqg00MYN0InBm3c5VS0NaKy9WiI D6hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=DGJUkxBEkPKQX2syIPkzi+3YLnncykR5nw5fG/RfPp0=; b=E6ZN0ZkOa4DBe74A5ze++08R297qd2NUmVxzqgZ24QmbVqkj3LJLyXRtn86tz/R9gJ GEf6zSg2u8zW+RkKxMbt2EJm6ghAWz/U302q7OzwOUvsVk5yCC88uzoeus7bsBX0xUZf 3vywUdzTLKqZvDQL0mAlPJ4pm2cGHE/h0j1E8yMOHViLVGt0CKQELNlDuT88+eDuAN0h mWo8A6vmjGB2VGo0Tq6S4VwAOJ6uRe3Ryga+esaVw3ZGi0V2zAM/qpyK7U2ZobdRK28s FTOzf2ctvuZLv7xRN5peS5oKlS9SHjhI5+dI6enlyF7pr62RJ+1FSzmum8PwyNnxhMKr 9LTQ== X-Gm-Message-State: ABUngveA50GwF9RhDyz1CfWDRWaBYF5JUMy69m32Tn2VoZ5wwx4BBMOLWPOlBcnd8gVv5g== X-Received: by 10.28.5.207 with SMTP id 198mr15012082wmf.4.1478708208661; Wed, 09 Nov 2016 08:16:48 -0800 (PST) Received: from sixbynine.org (82-132-216-223.dab.02.net. [82.132.216.223]) by smtp.gmail.com with ESMTPSA id t186sm7695819wmt.22.2016.11.09.08.16.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Nov 2016 08:16:48 -0800 (PST) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Nov 2016 16:15:56 +0000 Message-Id: <20161109161602.2402-6-robert@sixbynine.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161109161602.2402-1-robert@sixbynine.org> References: <20161109161602.2402-1-robert@sixbynine.org> Subject: [Intel-gfx] [PATCH igt v3 05/11] igt/gem_exec_parse: req. v < 9 for oacontrol tracking test 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 This limits testing the oacontrol tracking (required pairing of oa enable/disable per batch buffer) to version <= 8 of the command parser. Version 9 of the command parser removes all special handling for OACONTROL which is now going to be managed by i915-perf and not programmed from userspace. Signed-off-by: Robert Bragg Reviewed-by: Matthew Auld --- tests/gem_exec_parse.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/gem_exec_parse.c b/tests/gem_exec_parse.c index 2fea060..368f30b 100644 --- a/tests/gem_exec_parse.c +++ b/tests/gem_exec_parse.c @@ -349,8 +349,9 @@ static int fd; igt_main { + int parser_version = 0; + igt_fixture { - int parser_version = 0; drm_i915_getparam_t gp; int rc; @@ -521,6 +522,9 @@ igt_main 0x31337000, MI_BATCH_BUFFER_END, }; + + igt_require(parser_version < 9); + exec_batch(fd, handle, lri_ok, sizeof(lri_ok), I915_EXEC_RENDER,