From patchwork Sat Mar 16 14:00:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Siqueira X-Patchwork-Id: 10855851 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 C6B5014DE for ; Sat, 16 Mar 2019 14:00:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A070029D38 for ; Sat, 16 Mar 2019 14:00:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 936172A14F; Sat, 16 Mar 2019 14:00:31 +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 37A2B29D38 for ; Sat, 16 Mar 2019 14:00:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B81ED6E162; Sat, 16 Mar 2019 14:00:29 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id 421236E160; Sat, 16 Mar 2019 14:00:28 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id t28so13289520qte.6; Sat, 16 Mar 2019 07:00:28 -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=Uj18X88j1fQgtoE77oscklX/WZlSPLJ9mKas2n3jpv4=; b=Nfq3DDwDMnR4Ks+a3Z8cPYwm723WiAGfbzTOk0ps6UMpKZWctKq6WloBBRxWLpVvUu IAUveeAppU/Eq1a5TdqNvvFWltCg7+wh7yMPSKU7isI6n4oG0b2GpYOkTs/cXcIMoWHe yB/bKDXdKLAWDFV+c36WRT+iR46k4QBCBuJNydgAvbF2Jse0qhoubOvSdMXxn0XMViyL VpUEHPTo5bpoKg5EIHIg3sK0XZXOPx9/Xa95SpA9xifL4d9vMwVeMH0tU/hPgcTsF8a2 Pip8bpn6Dx7t7IK73nmfgHaFuNaRNF8mNvFLIuDonXwCZ2bmZLWCau7l5u+2H6uz3Rga ZCpg== X-Gm-Message-State: APjAAAUoXIzHDPihBT4VEuI/MWXi2aEdgYuzqB0936KccEr1F8+XVjAE mLeIE05z+oXs7px8gEwUKb4= X-Google-Smtp-Source: APXvYqxrsVikOYgmpLpNLUmWegiMrysd6dq5fB205vxSQBsZsuIpusk4+kArZQF+Vg06vXS9o3V9bw== X-Received: by 2002:ac8:7607:: with SMTP id t7mr4926232qtq.28.1552744827294; Sat, 16 Mar 2019 07:00:27 -0700 (PDT) Received: from smtp.gmail.com ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id o8sm2638957qkg.6.2019.03.16.07.00.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 16 Mar 2019 07:00:26 -0700 (PDT) Date: Sat, 16 Mar 2019 11:00:23 -0300 From: Rodrigo Siqueira To: Petri Latvala , Arkadiusz Hiler , Daniel Vetter , Chris Wilson Message-ID: <20190316140023.b5gn44gtojoy6iqi@smtp.gmail.com> MIME-Version: 1.0 Content-Disposition: inline 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=Uj18X88j1fQgtoE77oscklX/WZlSPLJ9mKas2n3jpv4=; b=DUM+yoF6cgYVhxlymUNqJ2Y884AUHJJSMunHreqiLZyvUDJzhw9EkHXOxDCKYgjhpB kLGIV0BMoSZgdHvsyj4fhFkI2cUVPcDWsOf5PsAxSdCer+mnOflffXmkf8Md58FtGWJ2 p5AMgxCInOtu2mG6ewnNCZSCo0+zIhxEEvPI1XDHiBuiOPCFc4aW6QYk8A/zbWkZfRty mX2rV3W45is20JPeaaO3loN3zAneuAQ+RGwaTtp7BoJV5akqbeISUA8JvWPdDUeVMGWO jMyaqJDeVSuQ58nb/rpdJU5jo2+CawRX6DtkhbXpQqz3kkQsYsnSLnLQFUChTqViiDuw vU8g== Subject: [Intel-gfx] [PATCH V5 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). 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 --- lib/igt_kms.c | 20 ++++++++++++++++++++ lib/igt_kms.h | 2 ++ tests/kms_flip.c | 22 ++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index e1eacc1e..1d2d7188 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1655,6 +1655,26 @@ void igt_assert_plane_visible(int fd, enum pipe pipe, bool visibility) 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 | DRM_VBLANK_NEXTONMISS; + + drmWaitVBlank(fd, &dummy_vbl); + return (errno != EOPNOTSUPP); +} + /* * A small modeset API */ diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 407f3d64..1cc15eea 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); +bool kms_has_vblank(int fd); + /* * A small modeset API */ diff --git a/tests/kms_flip.c b/tests/kms_flip.c index dfa5a69e..614efc5b 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; + + 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; @@ -1177,6 +1190,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 = true; switch (crtc_count) { case RUN_TEST: @@ -1260,6 +1274,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]);