[i-g-t,v1,09/14] tests: Open any driver

Commit Message

Tomeu Vizoso March 2, 2016, 2 p.m. UTC

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 <[e-mail]>
---

 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(-)

Patch

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 90c8da7a3772..cd46ee496ba3 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -2018,7 +2018,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 a27e5522daa0..c758ae8322b0 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 531ce8391fa7..bf3c260f8ac5 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -718,7 +718,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));
 	}