Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3610DC54FB3 for ; Mon, 26 May 2025 08:33:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B701810E2E6; Mon, 26 May 2025 08:33:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="e97BPA/b"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DFC310E2BD for ; Mon, 26 May 2025 08:32:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1748248378; x=1779784378; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=iGmH9wQ0bCHzq4NQfQLhXWy6FcVPOdZHaKyo7aort7g=; b=e97BPA/bdniTc0Pf5yPGwg5XKFgcq9Ywy1r7VDIWmo3X7gPscvHwqKWi xH7muMTQrFObdrv3sagQlY4iBtXwdBoeQzwp9LoAs2yQwOBb3dHeHiyww Wjqu9xWxA0AYmgKbwonCucIXR6vQHTsJZv3nUgbIxzddy3HwQvtyy6HXG Cpjgb1sEek6baEJt7h2NAKqXWItpdvf7x+ujTtoMuWjG/T/O4NYfUCeHE ByEXXkqK8dq8aQLaLgKBPEXdTetnqHiMieR4gYh1cTQE/4vVcf8pR/iqf zhFw+9AKl0S+B8iUKpp5k3rdIQME9RrqDOhANEQDnRbhcn+zob8QE/tgE g==; X-CSE-ConnectionGUID: 9Q44efG9SNetzXeLSkSFCw== X-CSE-MsgGUID: f9Q1eq0SSlOq1khb+97WZg== X-IronPort-AV: E=McAfee;i="6700,10204,11444"; a="37837408" X-IronPort-AV: E=Sophos;i="6.15,315,1739865600"; d="scan'208";a="37837408" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2025 01:32:58 -0700 X-CSE-ConnectionGUID: mdc+A7IFTpCLK+LuC4O3Ow== X-CSE-MsgGUID: IYsz3CvGRzGNdoxFFzUpeA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,315,1739865600"; d="scan'208";a="142864804" Received: from kunal-x299-aorus-gaming-3-pro.iind.intel.com ([10.190.239.13]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2025 01:32:55 -0700 From: Jeevan B To: igt-dev@lists.freedesktop.org Cc: karthik.b.s@intel.com, uma.shankar@intel.com, imre.deak@intel.com, Jeevan B Subject: [PATCH i-g-t] tests/kms_setmode: Check timing twice before asserting basic subtest Date: Mon, 26 May 2025 14:18:43 +0530 Message-Id: <20250526084843.2245484-1-jeevan.b@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" The check_timings() function previously failed tests if vblank timing was slightly off. This was too strict in general and caused false failures due to small timing variations, especially on some displays. This change adjusts the accuracy check to allow retries and provides more flexibility for minor timing differences. v2: Fix commit message and add igt_info for retry. Signed-off-by: Jeevan B --- tests/kms_setmode.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 484c3a95f..753c65ec0 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -461,7 +461,7 @@ static int test_stealing(int fd, struct crtc_config *crtc, uint32_t *ids) #define frame_time(km) (1000.0 * (km)->htotal * (km)->vtotal / (km)->clock) #define line_time(km) (1000.0 * (km)->htotal / (km)->clock) -static void check_timings(int crtc_idx, const drmModeModeInfo *kmode) +static bool check_timings(int crtc_idx, const drmModeModeInfo *kmode) { #define CALIBRATE_TS_STEPS 120 /* ~2s has to be less than 128! */ drmVBlank wait; @@ -540,9 +540,12 @@ static void check_timings(int crtc_idx, const drmModeModeInfo *kmode) 100 * accuracy / mean, accuracy / line_time(kmode)); /* 99.7% samples within one scanline on each side of mean */ - igt_assert_f(accuracy < line_time(kmode), - "vblank accuracy (%.3fus, %.1f%%) worse than a scanline (%.3fus)\n", - accuracy, 100 * accuracy / mean, line_time(kmode)); + if (accuracy >= line_time(kmode)) { + igt_info("vblank accuracy (%.3fus, %.1f%%) worse than a scanline (%.3fus)\n", + accuracy, 100 * accuracy / mean, line_time(kmode)); + + return false; + } /* At least 90% of frame times fall within the one scanline on each * side of expected mean. @@ -565,12 +568,18 @@ static void check_timings(int crtc_idx, const drmModeModeInfo *kmode) * See: * https://en.wikipedia.org/wiki/Standard_deviation#Rules_for_normally_distributed_data */ - igt_assert_f(fabs(mean - expected) < max(line_time(kmode), 1.718 * stddev), - "vblank interval differs from modeline! expected %.1fus, measured %1.fus +- %.3fus, difference %.1fus (%.1f sigma, %.1f scanlines)\n", - expected, mean, stddev, - fabs(mean - expected), - fabs(mean - expected) / stddev, - fabs(mean - expected) / line_time(kmode)); + if (fabs(mean - expected) >= max(line_time(kmode), 1.718 * stddev)) { + igt_info("vblank interval differs from modeline! expected %.1fus, " + "measured %1.fus +- %.3fus, difference %.1fus (%.1f sigma, %.1f scanlines)\n", + expected, mean, stddev, + fabs(mean - expected), + fabs(mean - expected) / stddev, + fabs(mean - expected) / line_time(kmode)); + + return false; + } + + return true; } static void test_crtc_config(const struct test_config *tconf, @@ -654,8 +663,18 @@ retry: igt_assert(config_failed == !!(tconf->flags & TEST_INVALID)); - if (ret == 0 && tconf->flags & TEST_TIMINGS) - check_timings(crtcs[0].crtc_idx, &crtcs[0].mode); + if (ret == 0 && tconf->flags & TEST_TIMINGS) { + bool status = false; + + for (int attempt = 1; attempt <= 2; attempt++) { + status = check_timings(crtcs[0].crtc_idx, &crtcs[0].mode); + if (status) + break; + igt_info("Timing check failed on attempt %d, retrying...\n", attempt); + } + + igt_assert_f(status, "VBlank timing test failed after 2 attempt(s)\n"); + } return; } -- 2.25.1