From patchwork Tue Oct 20 21:22:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zanoni, Paulo R" X-Patchwork-Id: 7450531 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A903C9F302 for ; Tue, 20 Oct 2015 21:22:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE6222086E for ; Tue, 20 Oct 2015 21:22:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C3DF320800 for ; Tue, 20 Oct 2015 21:22:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0933B6E16F; Tue, 20 Oct 2015 14:22:54 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 0612A6E267 for ; Tue, 20 Oct 2015 14:22:52 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 20 Oct 2015 14:22:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,708,1437462000"; d="scan'208";a="831572749" Received: from rehlert-mobl1.amr.corp.intel.com (HELO panetone.amr.corp.intel.com) ([10.252.197.226]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2015 14:22:35 -0700 From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 20 Oct 2015 19:22:17 -0200 Message-Id: <1445376139-14817-2-git-send-email-paulo.r.zanoni@intel.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445376139-14817-1-git-send-email-paulo.r.zanoni@intel.com> References: <1445349004-16409-1-git-send-email-paulo.r.zanoni@intel.com> <1445376139-14817-1-git-send-email-paulo.r.zanoni@intel.com> Subject: [Intel-gfx] [PATCH igt 2/4] kms_frontbuffer_tracking: add flag to not assert feature status 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.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 This will be used by the stridechange subtest. Signed-off-by: Paulo Zanoni --- tests/kms_frontbuffer_tracking.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index 421f949..2c0295c 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1540,23 +1540,26 @@ static void do_flush(const struct test_mode *t) } #define DONT_ASSERT_CRC (1 << 0) +#define DONT_ASSERT_FEATURE_STATUS (1 << 1) -#define FBC_ASSERT_FLAGS (0xF << 1) -#define ASSERT_FBC_ENABLED (1 << 1) -#define ASSERT_FBC_DISABLED (1 << 2) -#define ASSERT_LAST_ACTION_CHANGED (1 << 3) -#define ASSERT_NO_ACTION_CHANGE (1 << 4) +#define FBC_ASSERT_FLAGS (0xF << 2) +#define ASSERT_FBC_ENABLED (1 << 2) +#define ASSERT_FBC_DISABLED (1 << 3) +#define ASSERT_LAST_ACTION_CHANGED (1 << 4) +#define ASSERT_NO_ACTION_CHANGE (1 << 5) -#define PSR_ASSERT_FLAGS (3 << 5) -#define ASSERT_PSR_ENABLED (1 << 5) -#define ASSERT_PSR_DISABLED (1 << 6) +#define PSR_ASSERT_FLAGS (3 << 6) +#define ASSERT_PSR_ENABLED (1 << 6) +#define ASSERT_PSR_DISABLED (1 << 7) static int adjust_assertion_flags(const struct test_mode *t, int flags) { - if (!(flags & ASSERT_FBC_DISABLED)) - flags |= ASSERT_FBC_ENABLED; - if (!(flags & ASSERT_PSR_DISABLED)) - flags |= ASSERT_PSR_ENABLED; + if (!(flags & DONT_ASSERT_FEATURE_STATUS)) { + if (!(flags & ASSERT_FBC_DISABLED)) + flags |= ASSERT_FBC_ENABLED; + if (!(flags & ASSERT_PSR_DISABLED)) + flags |= ASSERT_PSR_ENABLED; + } if ((t->feature & FEATURE_FBC) == 0) flags &= ~FBC_ASSERT_FLAGS;