From patchwork Tue Jan 17 08:22:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kahola, Mika" X-Patchwork-Id: 9520091 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 2826B60244 for ; Tue, 17 Jan 2017 08:24:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13B96200DF for ; Tue, 17 Jan 2017 08:24:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0794A266F3; Tue, 17 Jan 2017 08:24:32 +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=-1.9 required=2.0 tests=BAYES_00 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 29A5B200DF for ; Tue, 17 Jan 2017 08:24:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A2996E619; Tue, 17 Jan 2017 08:24:19 +0000 (UTC) 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 ESMTPS id 1EADC6E618 for ; Tue, 17 Jan 2017 08:24:17 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 17 Jan 2017 00:24:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,243,1477983600"; d="scan'208";a="809794267" Received: from sorvi.fi.intel.com ([10.237.72.109]) by FMSMGA003.fm.intel.com with ESMTP; 17 Jan 2017 00:24:15 -0800 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Date: Tue, 17 Jan 2017 10:22:54 +0200 Message-Id: <1484641375-15983-2-git-send-email-mika.kahola@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484641375-15983-1-git-send-email-mika.kahola@intel.com> References: <1484641375-15983-1-git-send-email-mika.kahola@intel.com> Subject: [Intel-gfx] [PATCH i-g-t v2 1/2] tests/kms_plane_multiple: Relax atomic commit time requirement 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 Relax required time to atomic commits from 1 vblank to 2 vblanks. v2: Increase MAX_CRCS to 2 (Maarten) Reference: Issues seen on BYT CI tests Cc: Maarten Lankhorst Signed-off-by: Mika Kahola --- tests/kms_plane_multiple.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c index 792f530..dcea910 100644 --- a/tests/kms_plane_multiple.c +++ b/tests/kms_plane_multiple.c @@ -32,7 +32,7 @@ IGT_TEST_DESCRIPTION("Test atomic mode setting with multiple planes "); -#define MAX_CRCS 1 +#define MAX_CRCS 2 #define SIZE_PLANE 256 #define SIZE_CURSOR 128 #define LOOP_FOREVER -1 @@ -235,7 +235,7 @@ test_atomic_plane_position_with_output(data_t *data, enum pipe pipe, test_position_t test = { .data = data }; color_t blue = { 0.0f, 0.0f, 1.0f }; igt_crc_t *crc = NULL; - unsigned int vblank_start; + unsigned int vblank_start, vblank_stop; int i, n, ret; int iterations = opt.iterations < 1 ? 1 : opt.iterations; bool loop_forever; @@ -274,13 +274,14 @@ test_atomic_plane_position_with_output(data_t *data, enum pipe pipe, ret = read(data->display.drm_fd, buf, sizeof(buf)); igt_assert(ret >= 0); - igt_assert_eq(get_vblank(data->display.drm_fd, pipe, 0), vblank_start + 1); + vblank_stop = get_vblank(data->display.drm_fd, pipe, 0); igt_assert_eq(e->type, DRM_EVENT_FLIP_COMPLETE); igt_reset_timeout(); - n = igt_pipe_crc_get_crcs(data->pipe_crc, MAX_CRCS, &crc); + n = igt_pipe_crc_get_crcs(data->pipe_crc, vblank_stop - vblank_start, &crc); - igt_assert_eq(n, MAX_CRCS); + igt_assert(vblank_stop - vblank_start <= MAX_CRCS); + igt_assert_eq(n, vblank_stop - vblank_start); igt_assert_crc_equal(&test.reference_crc, crc);