From patchwork Thu Mar 23 12:48:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kahola X-Patchwork-Id: 9640985 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 14B73601E9 for ; Thu, 23 Mar 2017 12:47:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09F2226E16 for ; Thu, 23 Mar 2017 12:47:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2F6026E49; Thu, 23 Mar 2017 12:47:27 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,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 C13A926E16 for ; Thu, 23 Mar 2017 12:47:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E24336EA16; Thu, 23 Mar 2017 12:47:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id C49BE6EA11 for ; Thu, 23 Mar 2017 12:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490273244; x=1521809244; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=iWprxSk/buq8CeMwqMH/grDUlEIKH7/ncw1KxuMD5jY=; b=u2BCciDInFttmlxXXKQ5QZMDv7Yp3tbYzqA/OPYD2Yd3Up2Bhk8qawoG Gw1aMc7AaOXpFEuD6r+c6hIaCbd+hQ==; Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Mar 2017 05:47:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,209,1486454400"; d="scan'208";a="239514294" Received: from sorvi.fi.intel.com ([10.237.72.182]) by fmsmga004.fm.intel.com with ESMTP; 23 Mar 2017 05:47:23 -0700 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Mar 2017 14:48:28 +0200 Message-Id: <1490273311-9794-6-git-send-email-mika.kahola@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490273311-9794-1-git-send-email-mika.kahola@intel.com> References: <1490273311-9794-1-git-send-email-mika.kahola@intel.com> Subject: [Intel-gfx] [PATCH i-g-t v4 4/7] tests/kms_plane_scaling: Add TEST_ONLY flag 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 Add TEST_ONLY flag to test atomic scaling without actually committing the changes. v2: Create subtests with TEST_ONLY flag and one without v3: Rename subtest 'force-atomic-test' as 'with-atomic-test' Signed-off-by: Mika Kahola --- tests/kms_plane_scaling.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c index 1457894..8db91c3 100644 --- a/tests/kms_plane_scaling.c +++ b/tests/kms_plane_scaling.c @@ -310,21 +310,33 @@ static void test_plane_scaling(data_t *d) igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); } -igt_simple_main +igt_main { data_t data = {}; igt_skip_on_simulation(); + igt_fixture { + data.drm_fd = drm_open_driver(DRIVER_INTEL); + igt_require_pipe_crc(data.drm_fd); + igt_display_init(&data.display, data.drm_fd); + data.devid = intel_get_drm_devid(data.drm_fd); + data.num_scalers = intel_gen(data.devid) >= 9 ? 2 : 0; + } - data.drm_fd = drm_open_driver(DRIVER_INTEL); - igt_require_pipe_crc(data.drm_fd); - igt_display_init(&data.display, data.drm_fd); - data.devid = intel_get_drm_devid(data.drm_fd); + igt_subtest("with-atomic-test") { + data.display.force_test_atomic = true; + test_plane_scaling(&data); + } - data.num_scalers = intel_gen(data.devid) >= 9 ? 2 : 0; + igt_subtest("normal") { + data.display.force_test_atomic = false; + test_plane_scaling(&data); + } - test_plane_scaling(&data); + igt_fixture { + igt_display_fini(&data.display); + } - igt_display_fini(&data.display); + igt_exit(); }