From b26530c4c678ab1df7d7fd1ec963f7624dff2245 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 28 Feb 2019 18:17:23 +0100 Subject: tests: Use igt_device_set/drop_master Suggested by Chris. v2: Use "" for local includes (Chris). Cc: Chris Wilson Reviewed-by: Chris Wilson Signed-off-by: Daniel Vetter --- tests/kms_lease.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/kms_lease.c') 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 #include +#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)); -- cgit v1.2.3