summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-10-13 08:01:41 +0100
committerDave Airlie <airlied@redhat.com>2017-10-13 08:01:41 +0100
commitdf9b49b3643261ae656aada4d141136d0e1bef63 (patch)
tree6709ddd288c26da6fe1ee11c1909c0f6dc455d3c
parent7e333756d035fd7abc394e9d91eb5ec27e6525cd (diff)
kms_lease: fixup get lease test for new 3 objects
-rw-r--r--tests/kms_lease.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index dfef33f9..1379d2ff 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -361,7 +361,7 @@ static void lease_get(data_t *data)
{
lease_t lease;
struct local_drm_mode_get_lease mgl;
- uint32_t objects[2];
+ uint32_t objects[3];
int o;
/* Create a valid lease */
@@ -370,31 +370,38 @@ static void lease_get(data_t *data)
/* Get the number of objects */
mgl.count_objects = 0;
mgl.objects_ptr = 0;
+ mgl.pad = 0;
igt_assert_eq(get_lease(lease.fd, &mgl), 0);
- /* Make sure it's 2 */
- igt_assert_eq(mgl.count_objects, 2);
+ /* Make sure it's 3 */
+ igt_assert_eq(mgl.count_objects, 3);
/* Get the objects */
mgl.objects_ptr = (uint64_t) (uintptr_t) objects;
igt_assert_eq(get_lease(lease.fd, &mgl), 0);
- /* Make sure it's 2 */
- igt_assert_eq(mgl.count_objects, 2);
+ /* Make sure it's 3 */
+ igt_assert_eq(mgl.count_objects, 3);
- /* Make sure we got both the connector and crtc back */
- for (o = 0; o < 2; o++)
+ /* Make sure we got the connector, primary plane and crtc back */
+ for (o = 0; o < 3; o++)
if (objects[o] == data->connector_id)
break;
- igt_assert_neq(o, 2);
+ igt_assert_neq(o, 3);
- for (o = 0; o < 2; o++)
+ for (o = 0; o < 3; o++)
if (objects[o] == data->crtc_id)
break;
- igt_assert_neq(o, 2);
+ igt_assert_neq(o, 3);
+
+ for (o = 0; o < 3; o++)
+ if (objects[o] == data->primary_plane_id)
+ break;
+
+ igt_assert_neq(o, 3);
terminate_lease(&lease);
}