From patchwork Tue Oct 25 20:44:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Vlad X-Patchwork-Id: 9395447 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 7395C60233 for ; Tue, 25 Oct 2016 20:38:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E94D29769 for ; Tue, 25 Oct 2016 20:38:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 539D52976D; Tue, 25 Oct 2016 20:38:39 +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 B8DD329769 for ; Tue, 25 Oct 2016 20:38:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5662E6E748; Tue, 25 Oct 2016 20:38:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6E3E6E742 for ; Tue, 25 Oct 2016 20:38:28 +0000 (UTC) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP; 25 Oct 2016 13:38:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,399,1473145200"; d="scan'208";a="23605502" Received: from mcvlad-wk.rb.intel.com ([10.237.105.57]) by fmsmga005.fm.intel.com with ESMTP; 25 Oct 2016 13:38:27 -0700 From: Marius Vlad To: intel-gfx@lists.freedesktop.org Date: Tue, 25 Oct 2016 23:44:38 +0300 Message-Id: <20161025204438.2864-4-marius.c.vlad@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161025204438.2864-1-marius.c.vlad@intel.com> References: <20161025204438.2864-1-marius.c.vlad@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 3/3 v3] 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 v2: - don't read cached values (Chris Wilson) - warn on per connector, and fail per mean (Chris Wilson) These are synthetic: 5us per connector, and 600us for all (as threshold). Signed-off-by: Marius Vlad --- tests/Makefile.sources | 2 +- tests/kms_sysfs_edid_timing | 25 ---------- tests/kms_sysfs_edid_timing.c | 107 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 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 b1511c6..8af455a 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -212,6 +212,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! @@ -222,7 +223,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..3b8bca0 --- /dev/null +++ b/tests/kms_sysfs_edid_timing.c @@ -0,0 +1,107 @@ +/* + * 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 "igt_debugfs.h" +#include "igt_sysfs.h" +#include "igt_core.h" + +#include +#include +#include +#include + +#define USEC_PER_SEC (1000*1000) +#define THRESHOLD_PER_CONNECTOR 5 +#define THRESHOLD_TOTAL 600 + +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"); + +static uint64_t +mean(uint64_t *a, size_t a_len) +{ + int p; + uint64_t __sum; + + for (p = 0, __sum = 0; p < a_len; p++) { + __sum += a[p]; + } + + return (__sum / a_len); +} + +igt_simple_main +{ + int dir = igt_sysfs_open(-1, NULL); + DIR *dirp = fdopendir(dir); + struct dirent *de; + + int i, fd = 0; + int fds[32]; + + uint64_t elapsed, elapsed_mean; + uint64_t a[32]; + + struct stat st; + struct timespec start = {}; + + memset(fds, -1, sizeof(fds)); + memset(a, -1, sizeof(a)); + + while ((de = readdir(dirp))) { + + if (*de->d_name == '.') + continue; + + if (fstatat(dir, de->d_name, &st, 0)) + continue; + + if (S_ISDIR(st.st_mode) && !strncmp(de->d_name, "card0-", 6)) { + int dfd = openat(dir, de->d_name, O_RDONLY); + igt_assert(dfd > 0); + fds[fd++] = dfd; + } + } + closedir(dirp); + + for (i = 0; i < fd; i++) { + igt_sysfs_set(fds[i], "status", "detect"); + + elapsed = igt_nsec_elapsed(&start); + igt_sysfs_get(fds[i], "status"); + elapsed = igt_nsec_elapsed(&start); + + igt_warn_on_f(elapsed > (THRESHOLD_PER_CONNECTOR * USEC_PER_SEC), + "Threshold per connector exceeded (elapsed %lu ns)\n", elapsed); + + a[i] = elapsed; + close(fds[i]); + } + + elapsed_mean = mean(a, i); + igt_fail_on_f(elapsed_mean > THRESHOLD_TOTAL * USEC_PER_SEC, + "Threshold exceeded (mean %lu ns)\n", elapsed_mean); +}