diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-11-22 10:36:57 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-11-27 09:50:04 +0100 |
| commit | 88a50c7cb151ac5fd98c7ace158c6091053697dd (patch) | |
| tree | 28344b80ee4db2ca91125eeacaf1125dcf20cec6 /tests/kms_lease.c | |
| parent | 26a6f411ad9c1200a54e7f0542b0f8f4ecb9ce06 (diff) | |
tests: Use igt_display_require
Remaining tests that have been overlooked and don't need any
invasive changes to limit the skipping to only the relevant parts.
v2: [A rebase gone wrong]
v3: Move the misplaced hunk to the right patch (Antonio).
v4: Rebase, kms_content_protection is new.
v5: Rebase - need to adjust kms_lease.c too.
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (v3)
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Acked-By: Antonio Argenziano <antonio.argenziano@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/kms_lease.c')
| -rw-r--r-- | tests/kms_lease.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/kms_lease.c b/tests/kms_lease.c index e98c2a0f..cca42459 100644 --- a/tests/kms_lease.c +++ b/tests/kms_lease.c @@ -294,7 +294,7 @@ static void simple_lease(data_t *data) /* Create a valid lease */ igt_assert_eq(make_lease(data, &lease), 0); - igt_display_init(&lease.display, lease.fd); + igt_display_require(&lease.display, lease.fd); /* Set a mode on the leased output */ igt_assert_eq(0, prepare_crtc(&lease, data->connector_id, data->crtc_id)); @@ -432,7 +432,7 @@ static void lease_unleased_crtc(data_t *data) /* Create a valid lease */ igt_assert_eq(make_lease(data, &lease), 0); - igt_display_init(&lease.display, lease.fd); + igt_display_require(&lease.display, lease.fd); /* Find another CRTC that we don't control */ bad_crtc_id = 0; @@ -474,7 +474,7 @@ static void lease_unleased_connector(data_t *data) /* Create a valid lease */ igt_assert_eq(make_lease(data, &lease), 0); - igt_display_init(&lease.display, lease.fd); + igt_display_require(&lease.display, lease.fd); /* Find another connector that we don't control */ bad_connector_id = 0; @@ -509,7 +509,7 @@ static void lease_revoke(data_t *data) /* Create a valid lease */ igt_assert_eq(make_lease(data, &lease), 0); - igt_display_init(&lease.display, lease.fd); + igt_display_require(&lease.display, lease.fd); /* Revoke the lease using the master fd */ mrl.lessee_id = lease.lessee_id; @@ -633,7 +633,7 @@ igt_main igt_fixture { data.master.fd = drm_open_driver_master(DRIVER_ANY); kmstest_set_vt_graphics_mode(); - igt_display_init(&data.master.display, data.master.fd); + igt_display_require(&data.master.display, data.master.fd); } for (f = funcs; f->name; f++) { |