From patchwork Mon Jan 30 12:43:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maarten Lankhorst X-Patchwork-Id: 9545163 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 6FAEC60417 for ; Mon, 30 Jan 2017 12:43:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51B312679B for ; Mon, 30 Jan 2017 12:43:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 459C326E54; Mon, 30 Jan 2017 12:43:38 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 D52472679B for ; Mon, 30 Jan 2017 12:43:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 739296E419; Mon, 30 Jan 2017 12:43:37 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 106DA6E419 for ; Mon, 30 Jan 2017 12:43:36 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP; 30 Jan 2017 04:43:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,311,1477983600"; d="scan'208";a="219252121" Received: from dkeohane-mobl.ger.corp.intel.com (HELO patser.lan) ([10.252.26.125]) by fmsmga004.fm.intel.com with ESMTP; 30 Jan 2017 04:43:34 -0800 To: Mika Kahola , intel-gfx@lists.freedesktop.org References: <1485776227-3056-1-git-send-email-mika.kahola@intel.com> From: Maarten Lankhorst Message-ID: <07573726-6cca-00f6-43a1-6ab3a502ba68@linux.intel.com> Date: Mon, 30 Jan 2017 13:43:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1485776227-3056-1-git-send-email-mika.kahola@intel.com> Subject: Re: [Intel-gfx] [PATCH i-g-t v2] tests: Validate TEST_ONLY correctness against full atomic commit 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Op 30-01-17 om 12:37 schreef Mika Kahola: > Validate atomic commit correctness before actual commit. > > For: VIZ-6956 > > v2: Add flag to toggle TEST_ONLY for atomic commit. > Remove DRM_MODE_PAGE_FLIP_EVENT flag, if enabled, before trying atomic > commit with TEST_ONLY flag (Maarten) > > Cc: Maarten Lankhorst > > Signed-off-by: Mika Kahola > Hey, Way too complicated, I thought of something like this instead too run a whole test with TEST_ONLY. diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 77de678e121b..c935203f5b5c 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2332,7 +2332,23 @@ static int igt_atomic_commit(igt_display_t *display, uint32_t flags, void *user_ igt_atomic_prepare_connector_commit(output, req); } - ret = drmModeAtomicCommit(display->drm_fd, req, flags, user_data); + if (display->force_test_atomic && + !(flags & DRM_MODE_ATOMIC_TEST_ONLY)) { + unsigned int test_flags = flags & ~DRM_MODE_PAGE_FLIP_EVENT; + int test_ret; + + test_flags |= DRM_MODE_ATOMIC_TEST_ONLY; + + test_ret = drmModeAtomicCommit(display->drm_fd, req, test_flags, user_data); + ret = drmModeAtomicCommit(display->drm_fd, req, flags, user_data); + + if (test_ret) + igt_assert_eq(test_ret, ret); + else + igt_assert(ret != -EINVAL); + } else + ret = drmModeAtomicCommit(display->drm_fd, req, flags, user_data); + drmModeAtomicFree(req); return ret; diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 81be77f5a16f..8ac7eb074fe7 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -335,7 +335,7 @@ struct igt_display { igt_output_t *outputs; igt_pipe_t *pipes; bool has_cursor_plane; - bool is_atomic; + bool is_atomic, force_test_atomic; }; void igt_display_init(igt_display_t *display, int drm_fd);