From patchwork Tue Mar 8 14:51:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8535081 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A8D9CC0553 for ; Tue, 8 Mar 2016 14:54:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31B46200E7 for ; Tue, 8 Mar 2016 14:54:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 65CD4200D4 for ; Tue, 8 Mar 2016 14:54:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EE0B6E708; Tue, 8 Mar 2016 14:54:03 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71EFF6E706 for ; Tue, 8 Mar 2016 14:53:50 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id p65so4561402wmp.1 for ; Tue, 08 Mar 2016 06:53: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=1chOB5PvQFrUi90oWo/4iPO6uOGkTmRuvFRYmgcEuYI=; b=qUohVZAsKDrTJ4HZX9PN490r16fi6fe2iITptgwE8pUE1mBkd86wS+SkHCmkivsJu6 ePSzzaCPDiJdCVSG8g+yl+lQlG5mFHtzX0/atPVzyFCf9rK50ncORH4v2AVaijXtIoTj KARE5f3CPnWwWtddoveSPJuF/scZJ3j43W9/Dhg0nnUBUbOx7MxCd+l0rxDX3rp4w53Q Snevu7WWcfk0B1RMeckVkm8zhqVk/WjhvvwAqJzyrtoY8Ns75I6prZBqhu6ubYzVrbEg /5x5REhGllRD3R1lmdGDJq2tIkUK6meoTVeWSLMDaA3q9BjeibCVFzoHEBMGLGI7nymi ggYg== 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=1chOB5PvQFrUi90oWo/4iPO6uOGkTmRuvFRYmgcEuYI=; b=R4HIqfrjfNcLSVre+AYk3h1QzJcMkxLZHV3Ppc5Pbhw7D+3dTkOj9V9+SVrn16M+BC gi+cSBm+l//9IT4Qb0+RNoRZtgDkEMgUDs7qbjWsUAqr7eVBdUattrtA1CGcrLFhSj6M AQ09Zjn2AhmWc/zoFmSQ43Su08IpSpZSScwCGbaXII96WrUdX6SjZGmaDLfKg2gyPSis tbEzwUg3gsxbWnxVNpkgEYbDFw1ZZLAClo0KeHf2AtdLulUIGyPwVnHuAgl0mIOY2rFu NArwMgjfIrUWewl2JvICOETVGigbLUk5k7iORj0hnbnV6LBRtDHYp+nJGdrPQIFQ1jxc 0z3A== X-Gm-Message-State: AD7BkJIHG/2xSzw/JIgWZpmGS072mW8GXt7TyiZm9DssW3Tfj/D3YrjcDDHTDUAhaefong== X-Received: by 10.28.100.7 with SMTP id y7mr20719387wmb.87.1457448828318; Tue, 08 Mar 2016 06:53:48 -0800 (PST) Received: from cizrna.lan ([109.72.12.208]) by smtp.gmail.com with ESMTPSA id 3sm3781979wmp.14.2016.03.08.06.53.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2016 06:53:47 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Tue, 8 Mar 2016 15:51:38 +0100 Message-Id: <1457448699-9778-17-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> References: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Daniel Stone , Tomeu Vizoso , Micah Fedke , Gustavo Padovan , Emil Velikov Subject: [Intel-gfx] [i-g-t PATCH v2 16/17] kms_addfb_basic: Move calls to gem_set_tiling to the subtests 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 So they don't cause unrelated subtests to be skipped when testing drivers other than i915. Signed-off-by: Tomeu Vizoso --- Changes in v2: None tests/kms_addfb_basic.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index 6dfaecfc38a7..daba6b9aaeed 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -316,10 +316,8 @@ static void size_tests(int fd) f.fb_id = 0; } - igt_fixture - gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); - igt_subtest("bo-too-small-due-to-tiling") { + gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4); igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 && errno == EINVAL); } @@ -368,10 +366,8 @@ static void addfb25_tests(int fd) igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); } - igt_fixture - gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); - igt_subtest("addfb25-X-tiled-mismatch") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE; @@ -379,6 +375,7 @@ static void addfb25_tests(int fd) } igt_subtest("addfb25-X-tiled") { + gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4); igt_require_fb_modifiers(fd); f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED;