From patchwork Thu Feb 14 21:40:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10813921 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EBEB66C2 for ; Thu, 14 Feb 2019 21:48:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D75602EC1C for ; Thu, 14 Feb 2019 21:48:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB2AC2F1C1; Thu, 14 Feb 2019 21:48:33 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,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 59E0E2EC1C for ; Thu, 14 Feb 2019 21:48:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF94B6E408; Thu, 14 Feb 2019 21:48:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46D956E405; Thu, 14 Feb 2019 21:40:36 +0000 (UTC) Received: by mail-qk1-x742.google.com with SMTP id y195so4512598qka.12; Thu, 14 Feb 2019 13:40:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=JsAPqU97QygG9TnZqvUnQWfYucGpQCOo3R4+aa6gULU=; b=KBqMhZ7Xm45CJttU0r/gceA5Y+wcjMRRWjeI1YRbTPqJ7WdW326jrOJzk6LRWrVZRp mrQlSew4z3Nd9AW/aa+Lno1J/+XRgwVp453EJl2a/IbCjiN4ztP7/NtASwrAAFavfwfM vvl9Jw24xUhWW4ksh0HiMkpfzRtC15nEaLiVDv98GayTFTIBOp9/0DJz9loBrn71pUEa YL/PNhJB4WLplK5GXB+hVy/guHr9PXieTOcPXpUYo5N7jEk0Ok/NXu3sXUHtepM185qG Z33PC/a13+vqeGX835HhOZ+xzsdtvJbIE0MF0The6SCcZVT9tyRQ3ST8+isPhW/G/8+0 RtZg== X-Gm-Message-State: AHQUAua6gV9itjMGxMr8uwu3Hix1XRD/5yNkSiaxD0cgHabDBCfdYdLx n07+D/cWc1YOqPubSDN1JKC2q8RU X-Google-Smtp-Source: AHgI3IYCcJmOTKE4xBGoC8t6nQjDTdP0MeBqXuzR08pK9gvQtIBMmAm6vRGV+2vMxMRhSiIweHwEsg== X-Received: by 2002:a37:80b:: with SMTP id 11mr4502378qki.131.1550180435371; Thu, 14 Feb 2019 13:40:35 -0800 (PST) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id f19sm2443280qtf.1.2019.02.14.13.40.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 14 Feb 2019 13:40:34 -0800 (PST) Date: Thu, 14 Feb 2019 19:40:31 -0200 From: Rodrigo Siqueira To: Petri Latvala , Arkadiusz Hiler Message-ID: <20190214214031.tstbbmbaxf2fynvq@smtp.gmail.com> MIME-Version: 1.0 User-Agent: NeoMutt/20180716 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=JsAPqU97QygG9TnZqvUnQWfYucGpQCOo3R4+aa6gULU=; b=UxRB9Qnj7upxGtvUQrQF50uNpgseSVavCbv4d5+B29sloxD0qXOxfuz4WL5Iw8AsEX dThqdHRvpPc2u4bT8YojNJhZWO8vcqqEOsObArNpHtbFEWfZKQ8czQWVuDlY4gos5zor SPVJvnc5H04SUUzcavHJEPcC/5o0R1eWMVlb3ODr07jPWXLr/GN3f8wJ5ne9s9qcn+TT MF1PYoaj7AY6Gn27JdJgbgS0aBC1KkCF3dFoamYpGa9+tKWBxPuQK7/bevEtgOb0cYFR mX5Hm/irThtgaQl5REencKEl4z47TCh6FLwizqMFXZA1cZ65+olv6VN+TvLF/H/pThPP dTXg== Subject: [Intel-gfx] [PATCH V4 i-g-t] Skip VBlank tests in modules without VBlank X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The kms_flip test relies on VBlank support, and this situation may exclude some virtual drivers to take advantage of this set of tests. This commit adds a mechanism that checks if a module has VBlank. If the target module has VBlank support, kms_flip will run all the VBlank tests; otherwise, the VBlank tests will be skipped. Additionally, this commit improves the test coverage by checks if the function drmWaitVBlank() returns EOPNOTSUPP (i.e., no VBlank support). Changes since V3: Daniel Vetter: - Add documentation for kms_vblank_status() Changes since V2: - Add new branch coverage to check if VBlank is enabled or not - Update commit message - Change function name from kms_has_vblank to kms_vblank_status Changes since V1: Chris Wilson: - Change function name from igt_there_is_vblank to kms_has_vblank - Move vblank function check from igt_aux to igt_kms - Utilizes memset in dummy_vbl variable - Directly return the result of drmWaitVBlank() Signed-off-by: Rodrigo Siqueira --- lib/igt_kms.c | 20 ++++++++++++++++++++ lib/igt_kms.h | 2 ++ tests/kms_flip.c | 27 +++++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 85a911e1..81fbafe0 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1654,6 +1654,26 @@ void igt_assert_plane_visible(int fd, enum pipe pipe, bool visibility) igt_assert_eq(visible, visibility); } +/** + * kms_vblank_status: + * @fd: DRM fd + * + * Get the VBlank status after an attempt to call drmWaitVBlank(). This + * function is useful for checking if a driver has support or not for VBlank. + * + * Returns: The errno code generated by drmWaitVBlank() + */ +int kms_vblank_status(int fd) +{ + drmVBlank dummy_vbl; + + memset(&dummy_vbl, 0, sizeof(drmVBlank)); + dummy_vbl.request.type = DRM_VBLANK_ABSOLUTE; + + drmWaitVBlank(fd, &dummy_vbl); + return errno; +} + /* * A small modeset API */ diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 679d4e84..259eaa75 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -230,6 +230,8 @@ void kmstest_wait_for_pageflip(int fd); unsigned int kmstest_get_vblank(int fd, int pipe, unsigned int flags); void igt_assert_plane_visible(int fd, enum pipe pipe, bool visibility); +int kms_vblank_status(int fd); + /* * A small modeset API */ diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 798fc4e8..efc59328 100755 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -73,6 +73,7 @@ #define TEST_TS_CONT (1 << 27) #define TEST_BO_TOOBIG (1 << 28) +#define TEST_NO_VBLANK (1 << 29) #define TEST_BASIC (1 << 30) #define EVENT_FLIP (1 << 0) @@ -125,6 +126,18 @@ struct event_state { int seq_step; }; +static bool vblank_dependence(int flags) +{ + int vblank_flags = TEST_VBLANK | TEST_VBLANK_BLOCK | + TEST_VBLANK_ABSOLUTE | TEST_VBLANK_EXPIRED_SEQ | + TEST_TS_CONT | TEST_CHECK_TS | TEST_VBLANK_RACE; + + if (flags & vblank_flags) + return true; + + return false; +} + static float timeval_float(const struct timeval *tv) { return tv->tv_sec + tv->tv_usec / 1000000.0f; @@ -493,11 +506,11 @@ static void check_state(const struct test_output *o, const struct event_state *e /* check only valid if no modeset happens in between, that increments by * (1 << 23) on each step. This bounding matches the one in * DRM_IOCTL_WAIT_VBLANK. */ - if (!(o->flags & (TEST_DPMS | TEST_MODESET))) + if (!(o->flags & (TEST_DPMS | TEST_MODESET | TEST_NO_VBLANK))) { igt_assert_f(es->current_seq - (es->last_seq + o->seq_step) <= 1UL << 23, "unexpected %s seq %u, should be >= %u\n", es->name, es->current_seq, es->last_seq + o->seq_step); - + } /* Check that the vblank frame didn't wrap unexpectedly. */ if (o->flags & TEST_TS_CONT) { /* Ignore seq_step here since vblank waits time out immediately @@ -1184,6 +1197,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, unsigned bo_size = 0; uint64_t tiling; int i; + int vblank_status = 0; switch (crtc_count) { case 1: @@ -1267,6 +1281,15 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, } igt_assert(fb_is_bound(o, o->fb_ids[0])); + vblank_status = kms_vblank_status(drm_fd); + if (vblank_status == EOPNOTSUPP) { + if (vblank_dependence(o->flags)) + igt_require_f(!(vblank_status == EOPNOTSUPP), + "Vblank: %s\n", strerror(vblank_status)); + else + o->flags |= TEST_NO_VBLANK; + } + /* quiescent the hw a bit so ensure we don't miss a single frame */ if (o->flags & TEST_CHECK_TS) calibrate_ts(o, crtc_idxs[0]);