From patchwork Tue Mar 8 14:51:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8535031 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 076109F2B4 for ; Tue, 8 Mar 2016 14:53:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 12A8F200D4 for ; Tue, 8 Mar 2016 14:53:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3D7D6200D0 for ; Tue, 8 Mar 2016 14:53:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D28E6E704; Tue, 8 Mar 2016 14:53:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 681A46E701 for ; Tue, 8 Mar 2016 14:52:47 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id p65so4555444wmp.1 for ; Tue, 08 Mar 2016 06:52:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ybrhODhzcg9RoB+oNvM3sRj7omOyJ07oVPXaKe1L2pQ=; b=mrUjf/AaN5U+azQ+feXF6qAdXWNFOLWpHF/61xkp4JLPT/VQUv7H8d38lIKNinPFVs qZr7J/HIl7DNrIwNOHmLLTf+QbgiDW6saNLdAvmEQ80dJ4ZIMf3fIQJdbWwpERafs7M0 gWnECTtqbsBGxNCyZoVUjzuzPK8kCyifn7NEJOQmVkINNP4ulopAxG2FfV3j2FGPvwPk nvH3/N5AiGGyZVmO0aZAjQgG69DkgYrV2gNODCCGx31iWrKj1JChdNJDM4RRrPHD6k0s UO+eWqCq++dKHtrTbvqY2OQcmobQCTDhUVYyreTDdxO4C27YbaoGXLkdjEK3rQyGwUgG qH4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ybrhODhzcg9RoB+oNvM3sRj7omOyJ07oVPXaKe1L2pQ=; b=C9EBjE5t5tK48m8FBrsCnMsQUlAouWy5S1TgWAUbNyb57bl12qQi7OJ/Stw/dYOcXi x4ZxqgnCTxFTww89lBEIpXWfpZeqtwUuAo935/nm0eIbcDQ8srTnHUCJGGE6fUkWSDYL eS6BNVvKaaphQc6Yqs4iZF4g0s8Qh25+fSzRckQPoFR2CZuE/BCGoGB5W0GmCA5clAhx q3FvNpmJGJaho/4bzaxu9+BGHuh1AyZNffu60+zWZIabxTY5ip7V8EJvNne4WKmIJCVd M/DaXADfUmFlG1v+i6rm16gmSkUlge8bo97a0+XbXSr8SG4onqqOibsFTFuFPcxkzN6m 0nXg== X-Gm-Message-State: AD7BkJJHHMHms5mWDwiwPATL6LOKREav0YzFuYYvyqqzUp36hza073+NnzOc/OzzXCJ/uw== X-Received: by 10.194.116.9 with SMTP id js9mr34799185wjb.112.1457448765013; Tue, 08 Mar 2016 06:52:45 -0800 (PST) Received: from cizrna.lan ([109.72.12.208]) by smtp.gmail.com with ESMTPSA id 3sm3781979wmp.14.2016.03.08.06.52.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2016 06:52:43 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Tue, 8 Mar 2016 15:51:34 +0100 Message-Id: <1457448699-9778-13-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> References: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Daniel Stone , Tomeu Vizoso , Micah Fedke , Gustavo Padovan , Emil Velikov Subject: [Intel-gfx] [i-g-t PATCH v2 12/17] tests: Open any driver 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 For those tests that now pass on drivers other than i915, call drm_open_driver_master with DRIVER_ANY. Also do so from igt_enable_connectors. Signed-off-by: Tomeu Vizoso --- Changes in v2: None lib/igt_kms.c | 2 +- tests/drm_read.c | 2 +- tests/kms_addfb_basic.c | 2 +- tests/kms_atomic.c | 2 +- tests/kms_setmode.c | 2 +- tests/kms_vblank.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index a98c22a7f4dc..6deeaf1053eb 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2120,7 +2120,7 @@ void igt_enable_connectors(void) drmModeConnector *c; int drm_fd; - drm_fd = drm_open_driver(DRIVER_INTEL); + drm_fd = drm_open_driver(DRIVER_ANY); res = drmModeGetResources(drm_fd); diff --git a/tests/drm_read.c b/tests/drm_read.c index d69c7a0a903d..3980bb0580c5 100644 --- a/tests/drm_read.c +++ b/tests/drm_read.c @@ -225,7 +225,7 @@ igt_main siginterrupt(SIGALRM, 1); igt_fixture { - fd = drm_open_driver_master(DRIVER_INTEL); + fd = drm_open_driver_master(DRIVER_ANY); igt_require(pipe0_enabled(fd)); } diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index 73000d6e6fd7..d36cc6aab231 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -426,7 +426,7 @@ int gen; igt_main { igt_fixture { - fd = drm_open_driver_master(DRIVER_INTEL); + fd = drm_open_driver_master(DRIVER_ANY); gen = intel_gen(intel_get_drm_devid(fd)); } diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c index 2f3080af8633..afed1735a7fc 100644 --- a/tests/kms_atomic.c +++ b/tests/kms_atomic.c @@ -720,7 +720,7 @@ static void atomic_setup(struct kms_atomic_state *state) drmModePlaneResPtr res_plane; int i; - desc->fd = drm_open_driver_master(DRIVER_INTEL); + desc->fd = drm_open_driver_master(DRIVER_ANY); igt_assert_fd(desc->fd); do_or_die(drmSetClientCap(desc->fd, DRM_CLIENT_CAP_ATOMIC, 1)); diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index e7a5beefb159..24fb34ca0006 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -756,7 +756,7 @@ int main(int argc, char **argv) "only one of -d and -t is accepted\n"); igt_fixture { - drm_fd = drm_open_driver_master(DRIVER_INTEL); + drm_fd = drm_open_driver_master(DRIVER_ANY); if (!dry_run) kmstest_set_vt_graphics_mode(); diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c index e27a5dbd60cb..40ab6fdb1a11 100644 --- a/tests/kms_vblank.c +++ b/tests/kms_vblank.c @@ -177,7 +177,7 @@ igt_main igt_skip_on_simulation(); igt_fixture { - fd = drm_open_driver(DRIVER_INTEL); + fd = drm_open_driver(DRIVER_ANY); igt_require(crtc0_active(fd)); }