From patchwork Tue Sep 9 23:10:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 4873341 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 49062C0338 for ; Tue, 9 Sep 2014 23:10:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B0582013D for ; Tue, 9 Sep 2014 23:10:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 833DB2011D for ; Tue, 9 Sep 2014 23:10:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE1F689D9B; Tue, 9 Sep 2014 16:10:54 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 2265589D9B for ; Tue, 9 Sep 2014 16:10:52 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 09 Sep 2014 16:10:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,494,1406617200"; d="scan'208";a="570837771" Received: from rdvivi-bratislava.jf.intel.com ([10.7.196.158]) by orsmga001.jf.intel.com with ESMTP; 09 Sep 2014 16:10:48 -0700 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Tue, 9 Sep 2014 19:10:48 -0400 Message-Id: <1410304248-6064-1-git-send-email-rodrigo.vivi@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <20140904084551.GZ15520@phenom.ffwll.local> References: <20140904084551.GZ15520@phenom.ffwll.local> Cc: Rodrigo Vivi Subject: [Intel-gfx] [PATCH] tests/kms_psr_sink_crc: Adding test debug options X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Just to make life easier and be eable to easily test with PSR disabled to know exactly what to expect when running it for real v3: Use igt_debug helpers and add env option for running with psr disabled on this test without have to recompile like v1 or changing igt infrastructure like v2. I tried to add --disable-psr or local --dry-run but than it fails to print subtests so this was the safest way. Signed-off-by: Rodrigo Vivi --- tests/kms_psr_sink_crc.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c index 0917a7f..85e2502 100644 --- a/tests/kms_psr_sink_crc.c +++ b/tests/kms_psr_sink_crc.c @@ -36,6 +36,7 @@ #include "intel_chipset.h" #include "igt_debugfs.h" #include "igt_kms.h" +#include "igt_aux.h" enum tests { TEST_PAGE_FLIP, @@ -57,6 +58,8 @@ enum tests { TEST_SPRITE, }; +bool running_with_psr_disabled; + typedef struct { int drm_fd; enum tests test; @@ -264,6 +267,9 @@ static bool psr_enabled(data_t *data) FILE *file; char str[4]; + if (running_with_psr_disabled) + return true; + file = igt_debugfs_fopen("i915_edp_psr_status", "r"); igt_require(file); @@ -284,6 +290,9 @@ static bool psr_active(data_t *data) FILE *file; char str[4]; + if (running_with_psr_disabled) + return true; + file = igt_debugfs_fopen("i915_edp_psr_status", "r"); igt_require(file); @@ -327,6 +336,14 @@ static void get_sink_crc(data_t *data, char *crc) { igt_require(ret > 0); fclose(file); + + igt_debug("%s\n", crc); + igt_debug_wait_for_keypress("crc"); + + /* The important value was already taken. + * Now give a time for human eyes + */ + usleep(300000); } static void test_crc(data_t *data) @@ -342,7 +359,6 @@ static void test_crc(data_t *data) 1, 1) == 0); } - usleep(300000); igt_assert(wait_psr_entry(data, 10)); get_sink_crc(data, ref_crc); @@ -586,11 +602,16 @@ static void run_test(data_t *data) } } -data_t data = {}; -enum tests test; - igt_main { + data_t data = {}; + enum tests test; + char *env_psr; + + env_psr = getenv("IGT_PSR_DISABLED"); + + running_with_psr_disabled = (bool) env_psr; + igt_skip_on_simulation(); igt_fixture {