From patchwork Thu Oct 31 16:17:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3121151 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 105A2BEEB2 for ; Thu, 31 Oct 2013 16:18:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C195320460 for ; Thu, 31 Oct 2013 16:18:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5FB692047C for ; Thu, 31 Oct 2013 16:18:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22C0FEE887; Thu, 31 Oct 2013 09:18:02 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 05662EFE13 for ; Thu, 31 Oct 2013 09:17:59 -0700 (PDT) Received: by mail-ee0-f49.google.com with SMTP id e52so1451475eek.8 for ; Thu, 31 Oct 2013 09:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VpgNBqBLcgKix8Y2H3PNBNbPXbORc7wjp+HEkCyCMBU=; b=XeDAzsYtXDzztN1fN/KGAHBjAipMEUjqZQK40HUUScrtAoIw+OVVKzhXqMQUw+BZcW L51a+ShGLx15q36uBhOO3b6yr1EJcZRh57WDjalIZ36IYrvHzzQ0V+mFFYSVCMBtLeXY ZXGF7HJsJ7YiBarGZW9Gk+UJqjo/y9yLnbhuQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VpgNBqBLcgKix8Y2H3PNBNbPXbORc7wjp+HEkCyCMBU=; b=dxrDh1EUleLKqVY4oZg5IdOQyEadfhL0UHDMlnAA2oNryVSfVGd3/xmYDc8uwByeRR vKv3tbn1+bxPKbrNFzaFHHPHLxFCrDaaAIpqnyKzSehUyasHK/7x5KN+r/x+RL/lURvn pIwww11xcMar4lRBNw5QsN8B/wkZcDPqWRPRyMAXrwmIHdZVTYSBXSIEAtk8LHPC2ToQ M78/yDt4l1DaRw9fCimOyOnDjJuoDYIFsLeprI+cPwVbw0mIIQmTaI58h4h7JOZV5Bvj 3EVuo5ZrnblCVKfXSVvP1332lX2h9QCP5zGDu1UAynlq2kcufsendidIYK+nVezSrwGK pPag== X-Gm-Message-State: ALoCoQmGFw2LJ/v0k+FxJxsY+dqfXVluoTowjwua15CnMJag3/V4/EuWdeoAFBD7qpWkeAjdHKCh X-Received: by 10.15.45.135 with SMTP id b7mr116939eew.135.1383236276496; Thu, 31 Oct 2013 09:17:56 -0700 (PDT) Received: from gina.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id m54sm10364945eex.2.2013.10.31.09.17.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Oct 2013 09:17:54 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 31 Oct 2013 17:17:46 +0100 Message-Id: <1383236268-21925-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1383231150-13133-1-git-send-email-daniel.vetter@ffwll.ch> References: <1383231150-13133-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/3] lib: make igt_set_vt_graphics_mode never fail 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 All tests agree that this is a letal failure, so no point to pass it back to callers. Also add some igt_require calls for the drm_fd where I've noticed that it's missing. Signed-off-by: Daniel Vetter --- lib/drmtest.c | 7 +++---- lib/drmtest.h | 2 +- tests/debugfs_pipe_crc.c | 4 +++- tests/kms_cursor_crc.c | 4 +++- tests/kms_flip.c | 2 +- tests/kms_render.c | 2 +- tests/kms_setmode.c | 2 +- tests/pc8.c | 2 +- tests/testdisplay.c | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index 576b4ab..5887595 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -2110,10 +2110,9 @@ static void restore_vt_mode_at_exit(int sig) * original mode. */ -int igt_set_vt_graphics_mode(void) +void igt_set_vt_graphics_mode(void) { - if (igt_install_exit_handler(restore_vt_mode_at_exit)) - return -1; + do_or_die(igt_install_exit_handler(restore_vt_mode_at_exit)); igt_disable_exit_handler(); orig_vt_mode = set_vt_mode(KD_GRAPHICS); @@ -2121,7 +2120,7 @@ int igt_set_vt_graphics_mode(void) orig_vt_mode = -1UL; igt_enable_exit_handler(); - return orig_vt_mode < 0 ? -1 : 0; + igt_assert(orig_vt_mode >= 0); } int kmstest_get_connector_default_mode(int drm_fd, drmModeConnector *connector, diff --git a/lib/drmtest.h b/lib/drmtest.h index 9807bc7..5b35545 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -404,7 +404,7 @@ void igt_enable_exit_handler(void); void igt_disable_exit_handler(void); /* set vt into graphics mode, required to prevent fbcon from interfering */ -int igt_set_vt_graphics_mode(void); +void igt_set_vt_graphics_mode(void); /* prefault disabling, needs the corresponding debugfs interface */ void igt_disable_prefault(void); diff --git a/tests/debugfs_pipe_crc.c b/tests/debugfs_pipe_crc.c index fe14c6c..2096f49 100644 --- a/tests/debugfs_pipe_crc.c +++ b/tests/debugfs_pipe_crc.c @@ -218,7 +218,9 @@ int main(int argc, char **argv) const char *cmd = "pipe A none"; data.drm_fd = drm_open_any(); - do_or_die(igt_set_vt_graphics_mode()); + igt_require(data.drm_fd >= 0); + + igt_set_vt_graphics_mode(); display_init(&data); diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c index d29b0a6..2c9ca35 100644 --- a/tests/kms_cursor_crc.c +++ b/tests/kms_cursor_crc.c @@ -333,7 +333,9 @@ igt_main const char *cmd = "pipe A none"; data.drm_fd = drm_open_any(); - do_or_die(igt_set_vt_graphics_mode()); + igt_require(data.drm_fd >= 0); + + igt_set_vt_graphics_mode(); igt_debugfs_init(&data.debugfs); data.ctl = igt_debugfs_fopen(&data.debugfs, diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 58185ef..e8d3e22 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1493,7 +1493,7 @@ int main(int argc, char **argv) igt_fixture { drm_fd = drm_open_any(); - do_or_die(igt_set_vt_graphics_mode()); + igt_set_vt_graphics_mode(); do_or_die(igt_install_exit_handler(kms_flip_exit_handler)); get_timestamp_format(); diff --git a/tests/kms_render.c b/tests/kms_render.c index 6a41055..26ca8dc 100644 --- a/tests/kms_render.c +++ b/tests/kms_render.c @@ -242,7 +242,7 @@ int main(int argc, char **argv) devid = intel_get_drm_devid(drm_fd); batch = intel_batchbuffer_alloc(bufmgr, devid); - do_or_die(igt_set_vt_graphics_mode()); + igt_set_vt_graphics_mode(); } for (i = 0; i < ARRAY_SIZE(tests); i++) { diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 7b22225..6bc7db1 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -702,7 +702,7 @@ int main(int argc, char **argv) igt_fixture { drm_fd = drm_open_any(); if (!dry_run) - do_or_die(igt_set_vt_graphics_mode()); + igt_set_vt_graphics_mode(); drm_resources = drmModeGetResources(drm_fd); assert(drm_resources); diff --git a/tests/pc8.c b/tests/pc8.c index e3d6e33..0ec011e 100644 --- a/tests/pc8.c +++ b/tests/pc8.c @@ -292,7 +292,7 @@ static void init_mode_set_data(struct mode_set_data *data) data->bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096); data->devid = intel_get_drm_devid(drm_fd); - do_or_die(igt_set_vt_graphics_mode()); + igt_set_vt_graphics_mode(); drm_intel_bufmgr_gem_enable_reuse(data->bufmgr); } diff --git a/tests/testdisplay.c b/tests/testdisplay.c index a0f43e9..fd172f3 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -801,7 +801,7 @@ int main(int argc, char **argv) goto out_close; } - do_or_die(igt_set_vt_graphics_mode()); + igt_set_vt_graphics_mode(); mainloop = g_main_loop_new(NULL, FALSE); if (!mainloop) {