diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-28 18:17:23 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-03-01 08:52:00 +0100 |
| commit | b26530c4c678ab1df7d7fd1ec963f7624dff2245 (patch) | |
| tree | a2c678d00bf8cb7382f59d44016a392f9c95ba35 /tests/kms_lease.c | |
| parent | 8af74298b9cae6e149b59375919f968e0523de97 (diff) | |
tests: Use igt_device_set/drop_master
Suggested by Chris.
v2: Use "" for local includes (Chris).
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/kms_lease.c')
| -rw-r--r-- | tests/kms_lease.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/kms_lease.c b/tests/kms_lease.c index 4823121e..659d6549 100644 --- a/tests/kms_lease.c +++ b/tests/kms_lease.c @@ -43,6 +43,7 @@ #include <libudev.h> #include <drm.h> +#include "igt_device.h" IGT_TEST_DESCRIPTION("Test of CreateLease."); @@ -877,7 +878,7 @@ static void master_vs_lease(data_t *data) igt_assert(is_master(data->master.fd)); igt_assert(is_master(lease_fd)); - do_or_die(drmDropMaster(data->master.fd)); + igt_device_drop_master(data->master.fd); igt_assert(!is_master(data->master.fd)); igt_assert(!is_master(lease_fd)); @@ -885,7 +886,7 @@ static void master_vs_lease(data_t *data) igt_assert_eq(drmSetMaster(lease_fd), -1); igt_assert_eq(errno, EINVAL); - do_or_die(drmSetMaster(data->master.fd)); + igt_device_set_master(data->master.fd); igt_assert(is_master(data->master.fd)); igt_assert(is_master(lease_fd)); @@ -908,8 +909,8 @@ static void multimaster_lease(data_t *data) _create_simple_lease(master2_fd, data, -EACCES); - do_or_die(drmDropMaster(data->master.fd)); - do_or_die(drmSetMaster(master2_fd)); + igt_device_drop_master(data->master.fd); + igt_device_set_master(master2_fd); igt_assert(!is_master(data->master.fd)); igt_assert(!is_master(lease_fd)); @@ -921,7 +922,7 @@ static void multimaster_lease(data_t *data) close(master2_fd); /* close is an implicit DropMaster */ igt_assert(!is_master(lease2_fd)); - do_or_die(drmSetMaster(data->master.fd)); + igt_device_set_master(data->master.fd); igt_assert(is_master(data->master.fd)); igt_assert(is_master(lease_fd)); |