From patchwork Thu Mar 23 12:48:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kahola X-Patchwork-Id: 9640987 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 BDD7D601E9 for ; Thu, 23 Mar 2017 12:47:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1F02279E0 for ; Thu, 23 Mar 2017 12:47:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A522D28304; Thu, 23 Mar 2017 12:47:29 +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 6C0AF279E0 for ; Thu, 23 Mar 2017 12:47:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AFF376EA1B; Thu, 23 Mar 2017 12:47:28 +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 92F3D6E352 for ; Thu, 23 Mar 2017 12:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490273239; x=1521809239; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=pCv6t4l9NNDd5qKBr0n3QsH9EoLfeqsCsvuP6Azl4y0=; b=Fyen119262GSVR7aibArtmEGUi2e/zzrIligf8bczIugVN7U0dzISWjp pWjqOWzV5YC4hQmwM5fYvB955qfGPg==; 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:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,209,1486454400"; d="scan'208";a="239514279" Received: from sorvi.fi.intel.com ([10.237.72.182]) by fmsmga004.fm.intel.com with ESMTP; 23 Mar 2017 05:47:18 -0700 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Mar 2017 14:48:24 +0200 Message-Id: <1490273311-9794-2-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 1/7] lib/igt_kms: Add forcing TEST_ONLY for atomic commits 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 an option to force atomic commits to do commits with TEST_ONLY flag first before doing the actual commit. v2: Clear force_test_atomic flag if atomic commit with TEST_ONLY flag fails (Maarten) Signed-off-by: Mika Kahola --- lib/igt_kms.c | 22 +++++++++++++++++++++- lib/igt_kms.h | 1 + 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index d9f9672..a687939 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2436,7 +2436,27 @@ 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) { + if (test_ret != ret) + display->force_test_atomic = false; + + igt_assert_eq(test_ret, ret); + } else { + igt_assert(ret != -EINVAL); + } + } else + ret = drmModeAtomicCommit(display->drm_fd, req, flags, user_data); + if (!ret) { for_each_pipe(display, pipe) { diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 595832d..2972e94 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -368,6 +368,7 @@ struct igt_display { igt_pipe_t *pipes; bool has_cursor_plane; bool is_atomic; + bool force_test_atomic; }; void igt_display_init(igt_display_t *display, int drm_fd);