summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2016-02-24 10:47:09 +0100
committerDaniel Stone <daniels@collabora.com>2016-04-14 13:54:24 +0100
commitf4718c2b6c264c1825cde5213f61965e78c19c9d (patch)
tree746e5af5ae47f9a086d39e42850ed5ac0149858a
parent17a5d7168d4a4e5cdce6afa7ca125c4e60ebfb3f (diff)
tests: Open any driver
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 <tomeu.vizoso@collabora.com> Reviewed-by: Daniel Stone <daniels@collabora.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--lib/igt_kms.c2
-rw-r--r--tests/drm_read.c2
-rw-r--r--tests/kms_addfb_basic.c2
-rw-r--r--tests/kms_atomic.c2
-rw-r--r--tests/kms_setmode.c2
-rw-r--r--tests/kms_vblank.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 229396181d6a..8f30c94070d5 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -2490,7 +2490,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 7ea8c2e16eb3..30f312291fe7 100644
--- a/tests/kms_addfb_basic.c
+++ b/tests/kms_addfb_basic.c
@@ -481,7 +481,7 @@ int fd;
igt_main
{
igt_fixture
- fd = drm_open_driver_master(DRIVER_INTEL);
+ fd = drm_open_driver_master(DRIVER_ANY);
invalid_tests(fd);
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 6a6cfa7f0d77..13a5db1b7c54 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);
igt_skip_on(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));
}