From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: IGT development <igt-dev@lists.freedesktop.org>
Cc: Keith Packard <keithp@keithp.com>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [igt-dev] [PATCH i-g-t 5/9] tests/kms_lease: validate the possible_crtcs filtering
Date: Wed, 20 Feb 2019 17:25:26 +0100 [thread overview]
Message-ID: <20190220162530.31643-5-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20190220162530.31643-1-daniel.vetter@ffwll.ch>
Makes sure the possible_crtcs logically match between master and
lease, and that the values are correctly renumbered on the lease side.
Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
tests/kms_lease.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 298d81c71ba9..207a598d6f5a 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -732,6 +732,108 @@ static void invalid_create_leases(data_t *data)
drmModeFreeResources(resources);
}
+static void check_crtc_masks(int master_fd, int lease_fd, uint32_t crtc_mask)
+{
+ drmModeRes *resources;
+ drmModePlaneRes *plane_resources;
+ int i;
+
+ resources = drmModeGetResources(master_fd);
+ igt_assert(resources);
+ plane_resources = drmModeGetPlaneResources(master_fd);
+ igt_assert(plane_resources);
+
+ for (i = 0; i < resources->count_encoders; i++) {
+ drmModeEncoder *master_e, *lease_e;
+ bool possible;
+
+ master_e = drmModeGetEncoder(master_fd, resources->encoders[i]);
+ igt_assert(master_e);
+ lease_e = drmModeGetEncoder(lease_fd, resources->encoders[i]);
+ igt_assert(lease_e);
+
+ possible = master_e->possible_crtcs & crtc_mask;
+
+ igt_assert_eq(lease_e->possible_crtcs,
+ possible ? 1 : 0);
+ igt_assert_eq(master_e->possible_crtcs & crtc_mask,
+ possible ? crtc_mask : 0);
+ drmModeFreeEncoder(master_e);
+ drmModeFreeEncoder(lease_e);
+ }
+
+ for (i = 0; i < plane_resources->count_planes; i++) {
+ drmModePlane *master_p, *lease_p;
+ bool possible;
+
+ master_p = drmModeGetPlane(master_fd, plane_resources->planes[i]);
+ igt_assert(master_p);
+ lease_p = drmModeGetPlane(lease_fd, plane_resources->planes[i]);
+ igt_assert(lease_p);
+
+ possible = master_p->possible_crtcs & crtc_mask;
+
+ igt_assert_eq(lease_p->possible_crtcs,
+ possible ? 1 : 0);
+ igt_assert_eq(master_p->possible_crtcs & crtc_mask,
+ possible ? crtc_mask : 0);
+ drmModeFreePlane(master_p);
+ drmModeFreePlane(lease_p);
+ }
+
+ drmModeFreePlaneResources(plane_resources);
+ drmModeFreeResources(resources);
+}
+
+static void possible_crtcs_filtering(data_t *data)
+{
+ uint32_t *object_ids;
+ struct local_drm_mode_create_lease mcl;
+ drmModeRes *resources;
+ drmModePlaneRes *plane_resources;
+ int i;
+ int master_fd = data->master.fd;
+
+ resources = drmModeGetResources(master_fd);
+ igt_assert(resources);
+ plane_resources = drmModeGetPlaneResources(master_fd);
+ igt_assert(plane_resources);
+ mcl.object_count = resources->count_connectors +
+ plane_resources->count_planes + 1;
+ object_ids = calloc(mcl.object_count, sizeof(*object_ids));
+ igt_assert(object_ids);
+
+ for (i = 0; i < resources->count_connectors; i++)
+ object_ids[i] = resources->connectors[i];
+
+ for (i = 0; i < plane_resources->count_planes; i++)
+ object_ids[i + resources->count_connectors] =
+ plane_resources->planes[i];
+
+ mcl.object_ids = (uint64_t) (uintptr_t) object_ids;
+ mcl.flags = 0;
+
+ for (i = 0; i < resources->count_crtcs; i++) {
+ int lease_fd;
+
+ object_ids[mcl.object_count - 1] =
+ resources->crtcs[i];
+
+ igt_assert_eq(create_lease(master_fd, &mcl), 0);
+ lease_fd = mcl.fd;
+
+ drmSetClientCap(lease_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
+
+ check_crtc_masks(master_fd, lease_fd, 1 << i);
+
+ close(lease_fd);
+ }
+
+ free(object_ids);
+ drmModeFreePlaneResources(plane_resources);
+ drmModeFreeResources(resources);
+}
+
igt_main
{
data_t data;
@@ -767,4 +869,7 @@ igt_main
igt_subtest("invalid-create-leases")
invalid_create_leases(&data);
+
+ igt_subtest("possible-crtcs-filtering")
+ possible_crtcs_filtering(&data);
}
--
2.14.4
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-02-20 16:25 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 16:25 [igt-dev] [PATCH i-g-t 1/9] tests/kms_lease: Add invalid planes tests Daniel Vetter
2019-02-20 16:25 ` [igt-dev] [PATCH i-g-t 2/9] tests/kms_lease: Run on simulation Daniel Vetter
2019-03-14 9:29 ` Boris Brezillon
2019-02-20 16:25 ` [igt-dev] [PATCH i-g-t 3/9] tests/kms_lease: invalid corner-cases for create-lease ioctl Daniel Vetter
2019-02-20 20:43 ` Lyude Paul
2019-02-20 21:20 ` Daniel Vetter
2019-02-20 21:23 ` [igt-dev] [PATCH i-g-t] " Daniel Vetter
2019-02-21 3:08 ` [igt-dev] [PATCH i-g-t 3/9] " Keith Packard
2019-02-21 9:16 ` Daniel Vetter
2019-02-20 16:25 ` [igt-dev] [PATCH i-g-t 4/9] tests/kms_release: invalid checks for revoke-lease ioctl Daniel Vetter
2019-03-14 9:35 ` Boris Brezillon
2019-02-20 16:25 ` Daniel Vetter [this message]
2019-02-20 16:25 ` [igt-dev] [PATCH i-g-t 6/9] tests/kms_lease: Test drop/set_master interactions Daniel Vetter
2019-02-20 16:25 ` [igt-dev] [PATCH i-g-t 7/9] tests/kms_lease: multimaster testcase Daniel Vetter
2019-02-20 16:25 ` [igt-dev] [PATCH i-g-t 8/9] tests/kms_lease: validate implicitly added planes Daniel Vetter
2019-02-20 16:25 ` [igt-dev] [PATCH i-g-t 9/9] tests/kms_lease: exercise uevent Daniel Vetter
2019-02-20 20:33 ` [igt-dev] [PATCH i-g-t] " Daniel Vetter
2019-02-20 22:25 ` Lyude Paul
2019-02-20 23:33 ` Daniel Vetter
2019-02-20 23:34 ` Lyude Paul
2019-02-20 21:01 ` Daniel Vetter
2019-02-20 21:17 ` Daniel Vetter
2019-02-20 23:42 ` Lyude Paul
2019-02-20 23:48 ` Daniel Vetter
2019-02-21 0:16 ` Lyude Paul
2019-02-20 17:00 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests Patchwork
2019-02-20 19:51 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2019-02-20 20:42 ` Daniel Vetter
2019-02-20 21:11 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev2) Patchwork
2019-02-20 21:51 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev3) Patchwork
2019-02-20 22:02 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev5) Patchwork
2019-02-20 22:26 ` [igt-dev] [PATCH i-g-t 1/9] tests/kms_lease: Add invalid planes tests Lyude Paul
2019-02-21 1:25 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev2) Patchwork
2019-02-21 1:52 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev3) Patchwork
2019-02-21 2:57 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev5) Patchwork
2019-02-21 12:57 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev6) Patchwork
2019-02-21 18:24 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2019-02-21 19:28 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev7) Patchwork
2019-02-22 8:00 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2019-02-22 10:50 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/9] tests/kms_lease: Add invalid planes tests (rev8) Patchwork
2019-02-22 20:23 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-03-14 9:26 ` [igt-dev] [PATCH i-g-t 1/9] tests/kms_lease: Add invalid planes tests Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190220162530.31643-5-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=keithp@keithp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox