From patchwork Wed Jun 5 02:30:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10976265 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 7D4046C5 for ; Wed, 5 Jun 2019 02:31:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 678BC281B7 for ; Wed, 5 Jun 2019 02:31:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 591E3284D2; Wed, 5 Jun 2019 02:31:04 +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 37E34284B9 for ; Wed, 5 Jun 2019 02:31:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC93889453; Wed, 5 Jun 2019 02:31:01 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2B08893CB; Wed, 5 Jun 2019 02:31:00 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id 14so16382221qtf.0; Tue, 04 Jun 2019 19:31:00 -0700 (PDT) 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=FTWxXLULipVkAl/RE2kGwMTHlNJLR6nDDuFhU+L97xU=; b=t73g7wpjSPkAyS9O+I0awd1JO6/PdARuoykMs/69bbfW4if9D/q9Ga8VPGWyZOFmpf hNpysFLpJm6V0+CY7ffaYOIm1nNLX+pi4vClYwA0C2kSuwzzs3s3nWg6W0+zGiDRaoh5 j3ihIwumZmWKl/W8YvEBE6ewIB+gpskxjuxxjZ/9njvMECUGDvExsVU0kPs6sQgY0vxB OMM/o6p2TribRbaC1IGD6YVZWoTAY2xl5MC3EQL9oPeExOU3oZBiRdi6+kkkm9WmFBWt PmNcJYBeAjuYt9oc1skzba6HALErXJHckWFIr5AiS/Ajlgk+MMGEP2RIuvbIBhDEwAfg 9a0w== X-Gm-Message-State: APjAAAWbYjefjGnkcdfrvPnb3Z/fn6EJww9kUsgWtUBgDJNioLtaQGhI OVfmOyNgR5jIDSfS0PEgmtA= X-Google-Smtp-Source: APXvYqwTeVQlH3rVyaVowoBTOBSTk02ragWc2eFsLQ0RSsMmZRUJXIJYoZpY5BhtIFz7Q+Mv5wfIRQ== X-Received: by 2002:ac8:1796:: with SMTP id o22mr29523152qtj.98.1559701859698; Tue, 04 Jun 2019 19:30:59 -0700 (PDT) Received: from smtp.gmail.com ([187.121.151.146]) by smtp.gmail.com with ESMTPSA id j22sm5396331qtp.0.2019.06.04.19.30.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 04 Jun 2019 19:30:59 -0700 (PDT) Date: Tue, 4 Jun 2019 23:30:53 -0300 From: Rodrigo Siqueira To: Simon Ser , Petri Latvala , Arkadiusz Hiler , Chris Wilson , Daniel Vetter Message-ID: <20190605023053.h7q2ei2b7gf2k5pn@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=FTWxXLULipVkAl/RE2kGwMTHlNJLR6nDDuFhU+L97xU=; b=X+IAqgNo9j0dDlNLhfSMIG8gKoHt8YIlHEvT4CdYvzqfPn0U3euhThin3VpLAVZAEf NrWyNnGJQOEIAgPKb/1K8u0//1luJigz1XxOhHKalWcegcyibsp3qKPidc4HAhzTdwyK dAkz2TBNUdeX84MzmqgYJUu0zRgsSuY3AgdN/qn0NbJYkCiq7lsPE4b/x30FGaotsFoj bOu8Edj5stPGDWZ8TGocWBG7/qXADmj2gE8dD1S7etqGZaU4iR5a6/8aWm0s9xSJUrrr LpvotEd/BtB2jOMA6zFX7X8tbMhSNQK9aHqlG+XQ0eNR8gTVGJqH3HH797ITYGhyFiib Uw0g== Subject: [Intel-gfx] [PATCH V8 i-g-t] tests/kms_flip: 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). V7: Changes since V6 - Skip TEST_DPMS with TEST_MODESET and TEST_EBUSY if the device does not support vblank V6: Set errno to zero before call drmWaitVBlank() (Chris Wilson) V5: Drop the DRM_VBLANK_NEXTONMISS (Chris Wilson) V4: Replace DRM_VBLANK_ABSOLUTE by DRM_VBLANK_RELATIVE and DRM_VBLANK_NEXTONMISS V3: Add documentation (Daniel Vetter) V2: Add new branch coverage to check if VBlank is enabled or not and update commit message 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 Reviewed-by: Simon Ser --- lib/igt_kms.c | 21 +++++++++++++++++++++ lib/igt_kms.h | 2 ++ tests/kms_flip.c | 24 +++++++++++++++++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index d7d711a7..8a465f67 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1673,6 +1673,27 @@ void igt_assert_plane_visible(int fd, enum pipe pipe, int plane_index, bool visi igt_assert_eq(visible, visibility); } +/** + * kms_has_vblank: + * @fd: DRM fd + * + * Get the VBlank errno after an attempt to call drmWaitVBlank(). This + * function is useful for checking if a driver has support or not for VBlank. + * + * Returns: true if target driver has VBlank support, otherwise return false. + */ +bool kms_has_vblank(int fd) +{ + drmVBlank dummy_vbl; + + memset(&dummy_vbl, 0, sizeof(drmVBlank)); + dummy_vbl.request.type = DRM_VBLANK_RELATIVE; + + errno = 0; + drmWaitVBlank(fd, &dummy_vbl); + return (errno != EOPNOTSUPP); +} + /* * A small modeset API */ diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 4ac28131..5b5cf274 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -229,6 +229,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, int plane_index, bool visibility); +bool kms_has_vblank(int fd); + /* * A small modeset API */ diff --git a/tests/kms_flip.c b/tests/kms_flip.c index d7c1f9cf..2a158d97 100755 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -71,6 +71,7 @@ #define TEST_SUSPEND (1 << 26) #define TEST_BO_TOOBIG (1 << 28) +#define TEST_NO_VBLANK (1 << 29) #define TEST_BASIC (1 << 30) #define EVENT_FLIP (1 << 0) @@ -126,6 +127,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_CHECK_TS | TEST_VBLANK_RACE | TEST_EBUSY; + + 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; @@ -494,7 +507,7 @@ 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); @@ -1176,6 +1189,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, unsigned bo_size = 0; uint64_t tiling; int i; + bool vblank = true; switch (crtc_count) { case RUN_TEST: @@ -1259,6 +1273,14 @@ 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 = kms_has_vblank(drm_fd); + if (!vblank) { + if (vblank_dependence(o->flags)) + igt_require_f(vblank, "There is no VBlank\n"); + 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]);