From patchwork Fri May 3 13:31:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 2517101 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id D982C3FD1A for ; Fri, 3 May 2013 13:32:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D15A8E6510 for ; Fri, 3 May 2013 06:32:04 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id 70867E5C1D for ; Fri, 3 May 2013 06:31:56 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 03 May 2013 06:31:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,604,1363158000"; d="scan'208";a="297082118" Received: from intelbox.fi.intel.com (HELO localhost) ([10.237.72.70]) by azsmga001.ch.intel.com with ESMTP; 03 May 2013 06:31:54 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Fri, 3 May 2013 16:31:53 +0300 Message-Id: <1367587913-13434-1-git-send-email-imre.deak@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1367585296-9071-1-git-send-email-imre.deak@intel.com> References: <1367585296-9071-1-git-send-email-imre.deak@intel.com> Subject: [Intel-gfx] [i-g-t PATCH v2] kms_flip: make sure we are unblanked during the test X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org This is a probable reason for some of the sporadic kms_flip failures. One such is https://bugs.freedesktop.org/show_bug.cgi?id=59834. v2: - use unsigned long for KDSETMODE/KDGETMODE - fix passing the parameter to KDGETMODE as it should be by value - actually testing that it works.. Signed-off-by: Imre Deak --- tests/kms_flip.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 39f0043..601a4a1 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "i915_drm.h" #include "drmtest.h" @@ -1072,6 +1073,13 @@ static void run_test_on_crtc(struct test_output *o, int crtc, int duration) } assert(fb_is_bound(o, o->fb_ids[0])); + /* + * Make sure we're unblanked if for example the test was started with + * the console blanked. In this case the kernel might do a DPMS_ON in + * the above mode set call, but it's not guaranteed. + */ + do_or_die(set_dpms(o, DRM_MODE_DPMS_ON)); + /* quiescent the hw a bit so ensure we don't miss a single frame */ if (o->flags & TEST_CHECK_TS) sleep(1); @@ -1153,6 +1161,21 @@ static void get_timestamp_format(void) monotonic_timestamp ? "monotonic" : "real"); } +static unsigned long set_vt_mode(unsigned long mode) +{ + int fd; + unsigned long prev_mode; + + fd = open("/dev/tty0", O_RDONLY); + assert(fd >= 0); + + prev_mode = 0; + drmIoctl(fd, KDGETMODE, &prev_mode); + drmIoctl(fd, KDSETMODE, (void *)mode); + + return prev_mode; +} + int main(int argc, char **argv) { struct { @@ -1200,13 +1223,18 @@ int main(int argc, char **argv) { 1, TEST_FLIP | TEST_EINVAL | TEST_FB_BAD_TILING, "flip-vs-bad-tiling" }, }; int i; + bool dry_run; + unsigned long prev_vt_mode; drmtest_subtest_init(argc, argv); drm_fd = drm_open_any(); - if (!drmtest_only_list_subtests()) + dry_run = drmtest_only_list_subtests(); + if (!dry_run) { + prev_vt_mode = set_vt_mode(KD_GRAPHICS); get_timestamp_format(); + } bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096); devid = intel_get_drm_devid(drm_fd); @@ -1219,6 +1247,9 @@ int main(int argc, char **argv) } } + if (!dry_run) + set_vt_mode(prev_vt_mode); + close(drm_fd); return 0;