From patchwork Thu Dec 1 12:23:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Vlad X-Patchwork-Id: 9455933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A7EFF6074E for ; Thu, 1 Dec 2016 12:18:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A9DF28484 for ; Thu, 1 Dec 2016 12:18:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DFC1284CF; Thu, 1 Dec 2016 12:18:40 +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=-4.2 required=2.0 tests=BAYES_00, 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 EB55028484 for ; Thu, 1 Dec 2016 12:18:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B5E36E798; Thu, 1 Dec 2016 12:18:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7532B6E1AD for ; Thu, 1 Dec 2016 12:18:30 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 01 Dec 2016 04:18:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,282,1477983600"; d="scan'208";a="793024361" Received: from mcvlad-wk.rb.intel.com ([10.237.105.57]) by FMSMGA003.fm.intel.com with ESMTP; 01 Dec 2016 04:18:08 -0800 From: Marius Vlad To: intel-gfx@lists.freedesktop.org Date: Thu, 1 Dec 2016 14:23:58 +0200 Message-Id: <20161201122358.1124-5-marius.c.vlad@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161201122358.1124-1-marius.c.vlad@intel.com> References: <20161201122358.1124-1-marius.c.vlad@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 4/4 v7] tests/kms_sysfs_edid_timing: Convert sh to C version. 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The debug output for a HSW machine with two connectors (VGA and HDMI): DEBUG: card0-VGA-1: mean.max 12896229,00ns, 12896,23us, 12,90ms, mean.avg 12785055,80ns, 12785,06us, 12,79ms WARNING: card0-VGA-1: probe time exceed 10ms, max=12,90ms, avg=12,79ms DEBUG: card0-HDMI-A-1: mean.max 781433,00ns, 781,43us, 0,78ms, mean.avg 706643,20ns, 706,64us, 0,71ms v4: - do not include the time opening the fd (Chris Wilson) - include output from debug (Chris Wilson) v3: - use igt_mean for accounting (Chris Wilson) - make it Intel-agnostic when searching for connectors (Chris Wilson) v2: - don't read cached values (Chris Wilson) - warn on per connector, and fail per mean (Chris Wilson) These are synthetic: 10ms per connector, and 50ms for all. Signed-off-by: Marius Vlad --- tests/Makefile.sources | 2 +- tests/kms_sysfs_edid_timing | 25 ----------- tests/kms_sysfs_edid_timing.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 26 deletions(-) delete mode 100755 tests/kms_sysfs_edid_timing create mode 100644 tests/kms_sysfs_edid_timing.c diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 2d6ed8d..f835726 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -215,6 +215,7 @@ TESTS_progs = \ kms_sink_crc_basic \ prime_udl \ drv_module_reload \ + kms_sysfs_edid_timing \ $(NULL) # IMPORTANT: The ZZ_ tests need to be run last! @@ -225,7 +226,6 @@ TESTS_scripts_M = \ TESTS_scripts = \ debugfs_emon_crash \ drv_debugfs_reader \ - kms_sysfs_edid_timing \ sysfs_l3_parity \ test_rte_check \ tools_test \ diff --git a/tests/kms_sysfs_edid_timing b/tests/kms_sysfs_edid_timing deleted file mode 100755 index 46ea540..0000000 --- a/tests/kms_sysfs_edid_timing +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# This check the time we take to read the content of all the possible connectors. -# Without the edid -ENXIO patch (http://permalink.gmane.org/gmane.comp.video.dri.devel/62083), -# we sometimes take a *really* long time. So let's just check for some reasonable timing here -# - -DRM_LIB_ALLOW_NO_MASTER=1 - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -TIME1=$(date +%s%N) -cat $(find /sys/devices/|grep drm | grep /status) > /dev/null -TIME2=$(date +%s%N) - -# time in ms -RES=$(((TIME2 - TIME1) / 1000000)) - -if [ $RES -gt 600 ]; then - echo "Talking to outputs took ${RES}ms, something is wrong" - exit $IGT_EXIT_FAILURE -fi - -exit $IGT_EXIT_SUCCESS diff --git a/tests/kms_sysfs_edid_timing.c b/tests/kms_sysfs_edid_timing.c new file mode 100644 index 0000000..1201388 --- /dev/null +++ b/tests/kms_sysfs_edid_timing.c @@ -0,0 +1,97 @@ +/* + * Copyright © 2016 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +#include "igt.h" + +#include +#include +#include + +#define THRESHOLD_PER_CONNECTOR 10 +#define THRESHOLD_TOTAL 50 +#define CHECK_TIMES 15 + +IGT_TEST_DESCRIPTION("This check the time we take to read the content of all " + "the possible connectors. Without the edid -ENXIO patch " + "(http://permalink.gmane.org/gmane.comp.video.dri.devel/62083), " + "we sometimes take a *really* long time. " + "So let's just check for some reasonable timing here"); + + +igt_simple_main +{ + DIR *dirp; + struct dirent *de; + + dirp = opendir("/sys/class/drm"); + igt_assert(dirp != NULL); + + while ((de = readdir(dirp))) { + struct igt_mean mean = {}; + struct stat st; + char path[PATH_MAX]; + int i; + + if (*de->d_name == '.') + continue;; + + snprintf(path, sizeof(path), "/sys/class/drm/%s/status", + de->d_name); + + if (stat(path, &st)) + continue; + + igt_mean_init(&mean); + for (i = 0; i < CHECK_TIMES; i++) { + struct timespec ts = {}; + int fd; + + if ((fd = open(path, O_WRONLY)) < 0) + continue; + + igt_nsec_elapsed(&ts); + igt_ignore_warn(write(fd, "detect\n", 7)); + igt_mean_add(&mean, igt_nsec_elapsed(&ts)); + + close(fd); + } + + igt_debug("%s: mean.max %.2fns, %.2fus, %.2fms, " + "mean.avg %.2fns, %.2fus, %.2fms\n", + de->d_name, + mean.max, mean.max / 1e3, mean.max / 1e6, + mean.mean, mean.mean / 1e3, mean.mean / 1e6); + + if (mean.max > (THRESHOLD_PER_CONNECTOR * 1e6)) { + igt_warn("%s: probe time exceed 10ms, " + "max=%.2fms, avg=%.2fms\n", de->d_name, + mean.max / 1e6, mean.mean / 1e6); + } + igt_assert_f(mean.mean < (THRESHOLD_TOTAL * 1e6), + "%s: average probe time exceeded 50ms, " + "max=%.2fms, avg=%.2fms\n", de->d_name, + mean.max / 1e6, mean.mean / 1e6); + + } + closedir(dirp); + +}