From patchwork Mon May 19 13:42:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 4202581 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ABAF09F32A for ; Mon, 19 May 2014 13:42:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3F902024C for ; Mon, 19 May 2014 13:42:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0230A2018E for ; Mon, 19 May 2014 13:42:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A3A16E51B; Mon, 19 May 2014 06:42:16 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 06DC46E51B for ; Mon, 19 May 2014 06:42:13 -0700 (PDT) Received: by mail-wi0-f181.google.com with SMTP id n15so4180428wiw.2 for ; Mon, 19 May 2014 06:42:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gDKGM2OJF0sxCNfNoIvpfPPjUMqWUqSP9ua9SK2x49o=; b=jzcR1glQlYW/tgxpzzXvyfhRPBbyKnEjA+JVV5olZ1YCh56nDWl9+m96CxWUn56+uI EZYD5mX6Un5u2hWb120+W55kixFL3XJQlQfPAXDGocXPxDKiQZ4UQ9nFM6WkgY6Jn6Oo osacnmOBmomFCp0BW+NRmsMe2TY7IBl14S/Kxl9FuzcuGrT+v8adQInxHDoKbfjlIpqF FRpNpYcL36YS3jAArZshlsBYaeZgUG1lyYvEY+02MFOAyxJqizdQ1EORd9sMTqXNrXFL nc7rwme2BVEjSJ9kBndrscv3ezkQy439d2w7JF6w3Q+3uux9qO5npixrivwEWCDg6eap x+fg== X-Gm-Message-State: ALoCoQmO5nPi+qZ9IdJRvn2HriuuK5F6g4MwDwi4ME++82eKSqsvPaIQ5IPHM8yv0Y+qP3jEcUM+ X-Received: by 10.180.9.202 with SMTP id c10mr13159507wib.7.1400506933107; Mon, 19 May 2014 06:42:13 -0700 (PDT) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id fz11sm15157538wic.4.2014.05.19.06.42.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 May 2014 06:42:12 -0700 (PDT) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Mon, 19 May 2014 14:42:08 +0100 Message-Id: <1400506928-12775-3-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400506928-12775-1-git-send-email-thomas.wood@intel.com> References: <1400506928-12775-1-git-send-email-thomas.wood@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 2/2] tests: enable the VGA connector in the kms flip and pipe crc tests 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=-4.8 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 Signed-off-by: Thomas Wood --- tests/kms_flip.c | 7 +++++++ tests/kms_pipe_crc_basic.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/tests/kms_flip.c b/tests/kms_flip.c index f2ec9ef..7d6e102 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1566,6 +1566,8 @@ int main(int argc, char **argv) igt_fixture { drm_fd = drm_open_any(); + igt_set_vga_connector_state(drm_fd, FORCE_CONNECTOR_ON); + igt_set_vt_graphics_mode(); igt_install_exit_handler(kms_flip_exit_handler); get_timestamp_format(); @@ -1613,6 +1615,11 @@ int main(int argc, char **argv) } igt_stop_signal_helper(); + igt_fixture { + igt_set_vga_connector_state(drm_fd, + FORCE_CONNECTOR_UNSPECIFIED); + } + /* * Let drm_fd leak, since it's needed by the dpms restore * exit_handler and igt_exit() won't return. diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c index 282c7f6..eab3b3d 100644 --- a/tests/kms_pipe_crc_basic.c +++ b/tests/kms_pipe_crc_basic.c @@ -135,6 +135,8 @@ igt_main igt_fixture { data.drm_fd = drm_open_any(); + igt_set_vga_connector_state(data.drm_fd, FORCE_CONNECTOR_ON); + igt_set_vt_graphics_mode(); igt_require_pipe_crc(); @@ -164,5 +166,8 @@ igt_main igt_fixture { igt_display_fini(&data.display); + + igt_set_vga_connector_state(data.drm_fd, + FORCE_CONNECTOR_UNSPECIFIED); } }