From patchwork Thu May 19 00:07:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9123351 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 39AAA9F37F for ; Thu, 19 May 2016 00:07:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F61B2021F for ; Thu, 19 May 2016 00:07:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9A8CE20114 for ; Thu, 19 May 2016 00:07:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E946D6E424; Thu, 19 May 2016 00:07:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B3EB6E056 for ; Thu, 19 May 2016 00:07:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 31054260B71 From: robert.foss@collabora.com To: daniel.vetter@ffwll.ch, daniel.stone@collabora.com, marius.c.vlad@intel.com, ville.syrjala@linux.intel.com, jani.nikula@intel.com, chris@chris-wilson.co.uk Date: Wed, 18 May 2016 20:07:06 -0400 Message-Id: <1463616429-13079-5-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463616429-13079-1-git-send-email-robert.foss@collabora.com> References: <1463616429-13079-1-git-send-email-robert.foss@collabora.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH i-g-t v6 4/7] lib/igt_kms: Added kmstest_get_vbl_flag to igt_kms. 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=-5.6 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 From: Robert Foss Added function kmstest_get_vbl_flag() to igt_kms. This function formats a pipe_id into the format expected by DRM while processing DRM_IOCTL_WAIT_VBLANK. Signed-off-by: Robert Foss --- lib/igt_kms.c | 19 +++++++++++++++++++ lib/igt_kms.h | 1 + 2 files changed, 20 insertions(+) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 1113f57..0e781ef 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2562,3 +2562,22 @@ void igt_reset_connectors(void) close(fd); } } + +/** + * kmstest_get_vbl_flag: + * + * Convert a pipe id into the flag representation + * expected in DRM while processing DRM_IOCTL_WAIT_VBLANK. + */ +uint32_t kmstest_get_vbl_flag(uint32_t pipe_id) +{ + if (pipe_id == 0) + return 0; + else if (pipe_id == 1) + return _DRM_VBLANK_SECONDARY; + else { + uint32_t pipe_flag = pipe_id << 1; + igt_assert(!(pipe_flag & ~DRM_VBLANK_HIGH_CRTC_MASK)); + return pipe_flag; + } +} diff --git a/lib/igt_kms.h b/lib/igt_kms.h index b8f6dd8..7359d26 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -380,6 +380,7 @@ void igt_wait_for_vblank(int drm_fd, enum pipe pipe); void igt_enable_connectors(void); void igt_reset_connectors(void); +uint32_t kmstest_get_vbl_flag(uint32_t pipe_id); #define EDID_LENGTH 128 const unsigned char* igt_kms_get_base_edid(void);