From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [PATCH i-g-t 07/21] tests/kms_lease: Pass lease_t to prepare_crtc()
Date: Fri, 20 Feb 2026 16:01:39 +0200 [thread overview]
Message-ID: <20260220140154.4138-8-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20260220140154.4138-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
cleanup_crtc() gets passed the appropriate lease_t directly
by the caller, but prepare_crtc() instead takes the same information
as a boolean flag (and picks the appropriate lease_t based on that).
Unify the approach to also pass the appropriate lease_t directly
to prepare_crtc().
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
tests/kms_lease.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 045cd62de0d7..9f7935e99902 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -147,10 +147,9 @@ static igt_output_t *connector_id_to_output(igt_display_t *display, uint32_t con
return igt_output_from_connector(display, &connector);
}
-static int prepare_crtc(data_t *data, bool is_master)
+static int prepare_crtc(data_t *data, lease_t *lease)
{
drmModeModeInfo *mode;
- lease_t *lease = is_master ? &data->master : &data->lease;
igt_display_t *display = &lease->display;
igt_crtc_t *crtc = igt_crtc_for_crtc_id(display, data->crtc_id);
igt_output_t *output = connector_id_to_output(display, data->connector_id);
@@ -315,7 +314,7 @@ static void simple_lease(data_t *data)
igt_display_require(&data->lease.display, data->lease.fd);
/* Set a mode on the leased output */
- igt_assert_eq(0, prepare_crtc(data, false));
+ igt_assert_eq(0, prepare_crtc(data, &data->lease));
/* Paint something attractive */
paint_fb(data->lease.fd, &data->lease.primary_fb, "simple-lease",
@@ -364,7 +363,7 @@ static void page_flip_implicit_plane(data_t *data)
drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
/* Set a mode on the leased output */
- igt_assert_eq(0, prepare_crtc(data, true));
+ igt_assert_eq(0, prepare_crtc(data, &data->master));
/* sanity check */
do_or_die(drmModePageFlip(data->master.fd, data->crtc_id,
@@ -436,7 +435,7 @@ static void setcrtc_implicit_plane(data_t *data)
}
/* Set a mode on the leased output */
- igt_assert_eq(0, prepare_crtc(data, true));
+ igt_assert_eq(0, prepare_crtc(data, &data->master));
/* sanity check */
ret = drmModeSetCrtc(data->master.fd, data->crtc_id, -1,
@@ -477,7 +476,7 @@ static void cursor_implicit_plane(data_t *data)
drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
/* Set a mode on the leased output */
- igt_assert_eq(0, prepare_crtc(data, true));
+ igt_assert_eq(0, prepare_crtc(data, &data->master));
/* sanity check */
do_or_die(drmModeSetCursor(data->master.fd, data->crtc_id, 0, 0, 0));
@@ -788,7 +787,7 @@ static void lease_revoke(data_t *data)
igt_assert_eq(revoke_lease(data->master.fd, &mrl), 0);
/* Try to use the leased objects */
- ret = prepare_crtc(data, false);
+ ret = prepare_crtc(data, &data->lease);
/* Ensure that the expected error is returned */
igt_assert_eq(ret, -ENOENT);
--
2.52.0
next prev parent reply other threads:[~2026-02-20 14:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-20 14:01 [PATCH i-g-t 00/21] tests/kms: More igt_crtc_t conversions Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 01/21] tests/intel/kms_flip_scaled_crc: Remove unused 'enum pipe pipe' Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 02/21] tests/kms_concurrent: Actually run the test over all connected crtcs Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 03/21] tests/amdgpu/amd_abm: Don't use uninitialized 'pipe' Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 04/21] tests/kms: Use 'enum pipe' over int' Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 05/21] lib/kms: Add igt_crtc_for_crtc_id() Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 06/21] tests/kms_lease: Use igt_crtc_t instead of enum pipe Ville Syrjala
2026-02-20 14:01 ` Ville Syrjala [this message]
2026-02-20 14:01 ` [PATCH i-g-t 08/21] tests/intel/kms_frontbuffer_tracking: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 09/21] tests/kms_plane_scaling: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 10/21] tests/drm_read: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 11/21] tests/intel/kms_psr2_sf: Convert pipes[] to crtcs[] Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 12/21] tests/kms_vblank: Use igt_crtc_t instead of enum pipe Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 13/21] tests/kms_plane_multiple: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 14/21] tests/kms_tiled_display: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 15/21] tests/intel/kms_psr: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 16/21] tests/kms_prime: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 17/21] tests/chamelium: " Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 18/21] tests/kms: Use igt_crtc_t instead of enum pipe, part 1 Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 19/21] tests/kms: Use igt_crtc_t instead of enum pipe, part 2 Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 20/21] tests/kms: Use igt_crtc_t instead of enum pipe, part 3 Ville Syrjala
2026-02-20 14:01 ` [PATCH i-g-t 21/21] tests/kms: Use igt_crtc_t instead of enum pipe, part 4 Ville Syrjala
2026-02-20 17:33 ` ✓ Xe.CI.BAT: success for tests/kms: More igt_crtc_t conversions Patchwork
2026-02-20 17:49 ` ✓ i915.CI.BAT: " Patchwork
2026-02-21 1:27 ` ✗ i915.CI.Full: failure " Patchwork
2026-02-21 6:32 ` ✗ Xe.CI.FULL: " Patchwork
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=20260220140154.4138-8-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
/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