From: Kunal Joshi <kunal1.joshi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Kunal Joshi <kunal1.joshi@intel.com>, Jeevan B <jeevan.b@intel.com>
Subject: [PATCH i-g-t 1/5] tests/intel/kms_joiner_helper: add helper for joiner-related functions
Date: Mon, 3 Feb 2025 13:42:37 +0530 [thread overview]
Message-ID: <20250203081241.659139-2-kunal1.joshi@intel.com> (raw)
In-Reply-To: <20250203081241.659139-1-kunal1.joshi@intel.com>
Add helper to handle Big Joiner and Ultra Joiner
logic in a centralized manner. Add utility functions
to set and manage master pipes, as well as to assign
consecutive pipes for multi-pipe configurations.
v2: cosmetic changes (Swati)
Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com>
Reviewed-by: Jeevan B <jeevan.b@intel.com>
---
tests/intel/kms_joiner.c | 15 +--
tests/intel/kms_joiner_helper.c | 176 ++++++++++++++++++++++++++++++++
tests/intel/kms_joiner_helper.h | 15 +++
tests/meson.build | 1 +
4 files changed, 194 insertions(+), 13 deletions(-)
create mode 100644 tests/intel/kms_joiner_helper.c
create mode 100644 tests/intel/kms_joiner_helper.h
diff --git a/tests/intel/kms_joiner.c b/tests/intel/kms_joiner.c
index 086cfeb71..0a9910046 100644
--- a/tests/intel/kms_joiner.c
+++ b/tests/intel/kms_joiner.c
@@ -37,6 +37,7 @@
#include "igt.h"
#include "xe/xe_query.h"
#include "kms_dsc_helper.c"
+#include "kms_joiner_helper.h"
/**
* SUBTEST: invalid-modeset-big-joiner
@@ -100,18 +101,6 @@ typedef struct {
static int max_dotclock;
-static void set_all_master_pipes_for_platform(data_t *data)
-{
- enum pipe pipe;
-
- for (pipe = PIPE_A; pipe < IGT_MAX_PIPES - 1; pipe++) {
- if (data->display.pipes[pipe].enabled && data->display.pipes[pipe + 1].enabled) {
- data->master_pipes |= BIT(pipe);
- igt_info("Found master pipe %s\n", kmstest_pipe_name(pipe));
- }
- }
-}
-
static void enable_force_joiner_on_all_non_big_joiner_outputs(data_t *data)
{
bool status;
@@ -512,7 +501,7 @@ igt_main
data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_XE);
kmstest_set_vt_graphics_mode();
igt_display_require(&data.display, data.drm_fd);
- set_all_master_pipes_for_platform(&data);
+ igt_set_all_master_pipes_for_platform(&data.display, &data.master_pipes);
igt_require(data.display.is_atomic);
max_dotclock = igt_get_max_dotclock(data.drm_fd);
diff --git a/tests/intel/kms_joiner_helper.c b/tests/intel/kms_joiner_helper.c
new file mode 100644
index 000000000..a2155f809
--- /dev/null
+++ b/tests/intel/kms_joiner_helper.c
@@ -0,0 +1,176 @@
+#include "kms_joiner_helper.h"
+#include "igt.h"
+#include "igt_kms.h"
+#include "intel_chipset.h"
+
+/*
+ * Detect if the output needs 1, 2, or 4 pipes (non-joiner, big joiner, ultra).
+ */
+static int get_required_pipes(int drm_fd, igt_output_t *output)
+{
+ bool is_big = false, is_ultra = false;
+ int max_dotclock;
+ drmModeModeInfo mode;
+
+ if (!is_intel_device(drm_fd))
+ return -1;
+
+ max_dotclock = igt_get_max_dotclock(drm_fd);
+
+ is_ultra = ultrajoiner_mode_found(drm_fd,
+ output->config.connector,
+ max_dotclock,
+ &mode);
+ is_big = bigjoiner_mode_found(drm_fd,
+ output->config.connector,
+ max_dotclock,
+ &mode);
+
+ if (is_ultra)
+ return 4;
+ if (is_big)
+ return 2;
+
+ return 1;
+}
+
+/*
+ * Internal helper to find a block of consecutive free pipes
+ * in available_pipes_mask. If count > 1, the first pipe must also
+ * be in master_pipes_mask.
+ *
+ * Returns the starting pipe index or -1 if not found.
+ */
+static int find_consecutive_pipes(int n_pipes,
+ uint32_t available_pipes_mask,
+ uint32_t master_pipes_mask,
+ int count)
+{
+ int i = 0, pipe_idx = 0;
+ bool can_use;
+
+ for (int start = 0; start < n_pipes; start++) {
+ if (((start + count) - 1) >= n_pipes)
+ break;
+
+ if ((count > 1) && (!(BIT(start) & master_pipes_mask)))
+ continue;
+
+ can_use = true;
+ for (i = 0; i < count; i++) {
+ pipe_idx = start + i;
+ if (!(BIT(pipe_idx) & available_pipes_mask)) {
+ can_use = false;
+ break;
+ }
+ }
+ if (can_use)
+ return start;
+ }
+ return -1;
+}
+
+static enum pipe get_next_master_pipe(uint32_t pipe_mask)
+{
+ int i;
+
+ if (!pipe_mask)
+ return PIPE_NONE;
+
+ i = ffs(pipe_mask) - 1;
+
+ if (i < 0)
+ return PIPE_NONE;
+
+ return i;
+}
+
+/**
+ * igt_set_all_master_pipes_for_platform:
+ * @master_pipes: Pointer to the variable to store the master pipes bitmask.
+ * @display: The display structure containing pipe information.
+ *
+ * This function sets the master pipes for the platform by checking if consecutive
+ * pipes are enabled. If both pipe and the next pipe are enabled, the pipe is
+ * considered a master pipe.
+ */
+void igt_set_all_master_pipes_for_platform(igt_display_t *display, uint32_t *master_pipes)
+{
+ enum pipe pipe;
+
+ *master_pipes = 0;
+ for (pipe = PIPE_A; pipe < IGT_MAX_PIPES - 1; pipe++) {
+ if (display->pipes[pipe].enabled && display->pipes[pipe + 1].enabled) {
+ *master_pipes |= BIT(pipe);
+ igt_info("Found master pipe %s\n", kmstest_pipe_name(pipe));
+ }
+ }
+}
+
+/*
+ * @drm_fd: DRM file descriptor
+ * @outputs: array of pointers to igt_output_t
+ * @num_outputs: how many outputs in the array
+ * @n_pipes: total number of pipes available
+ * @used_pipes_mask: pointer to a bitmask (in/out) of already-used pipes
+ * @master_pipes_mask: bitmask of valid "master" pipes
+ * @valid_pipes_mask: bitmask of valid (non-fused) pipes
+ *
+ * Assign pipes to outputs based on the number of required pipes.
+ * This function will assign 1, 2, or 4 consecutive pipes to each output.
+ * It will also mark the used pipes in the bitmask.
+ *
+ * Returns: true if all outputs can be assigned successfully; false otherwise.
+ */
+bool igt_assign_pipes_for_outputs(int drm_fd,
+ igt_output_t **outputs,
+ int num_outputs,
+ int n_pipes,
+ uint32_t *used_pipes_mask,
+ uint32_t master_pipes_mask,
+ uint32_t valid_pipes_mask)
+{
+ int i = 0, idx = 0, needed = 0, start = 0;
+ uint32_t available_pipes_mask = 0;
+ enum pipe mp = PIPE_NONE;
+ igt_output_t *out;
+
+ for (idx = 0; idx < num_outputs; idx++) {
+ out = outputs[idx];
+ needed = get_required_pipes(drm_fd, out);
+ if (needed < 0)
+ return false;
+
+ available_pipes_mask = (~(*used_pipes_mask)) & valid_pipes_mask;
+ start = find_consecutive_pipes(n_pipes, available_pipes_mask,
+ master_pipes_mask, needed);
+
+ if (start < 0) {
+ igt_debug("Cannot allocate %d consecutive pipes for output %s\n",
+ needed, out->name);
+ return false;
+ }
+
+ igt_info("Assigning %d pipes [start=%s..%s] to output %s\n",
+ needed, kmstest_pipe_name(start),
+ kmstest_pipe_name(start + needed - 1), out->name);
+
+ if (needed > 1) {
+ mp = get_next_master_pipe(BIT(start));
+
+ if (mp == PIPE_NONE) {
+ igt_debug("Failed to confirm master pipe for %s\n",
+ out->name);
+ return false;
+ }
+ igt_output_set_pipe(out, start);
+ igt_debug("Using pipe %s as master.\n",
+ kmstest_pipe_name(start));
+ } else
+ igt_output_set_pipe(out, start);
+
+ for (i = 0; i < needed; i++)
+ *used_pipes_mask |= BIT(start + i);
+ }
+ return true;
+}
diff --git a/tests/intel/kms_joiner_helper.h b/tests/intel/kms_joiner_helper.h
new file mode 100644
index 000000000..95e71a229
--- /dev/null
+++ b/tests/intel/kms_joiner_helper.h
@@ -0,0 +1,15 @@
+#ifndef KMS_JOINER_HELPER_H
+#define KMS_JOINER_HELPER_H
+
+#include "igt_kms.h"
+
+void igt_set_all_master_pipes_for_platform(igt_display_t *display,
+ uint32_t *master_pipes);
+bool igt_assign_pipes_for_outputs(int drm_fd,
+ igt_output_t **outputs,
+ int num_outputs,
+ int n_pipes,
+ uint32_t *used_pipes_mask,
+ uint32_t master_pipes_mask,
+ uint32_t valid_pipes_mask);
+#endif
diff --git a/tests/meson.build b/tests/meson.build
index 33dffad31..b2a7d7760 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -367,6 +367,7 @@ extra_sources = {
'kms_chamelium_frames': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
'kms_chamelium_hpd': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ],
'kms_dsc': [ join_paths ('intel', 'kms_dsc_helper.c') ],
+ 'kms_joiner': [ join_paths ('intel', 'kms_joiner_helper.c') ],
'kms_psr2_sf': [ join_paths ('intel', 'kms_dsc_helper.c') ],
}
--
2.25.1
next prev parent reply other threads:[~2025-02-03 7:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-03 8:12 [PATCH i-g-t 0/5] add test to validate uhbr/non-uhbr over sst/mst Kunal Joshi
2025-02-03 8:12 ` Kunal Joshi [this message]
2025-02-03 8:12 ` [PATCH i-g-t 2/5] tests/intel/kms_mst_helper: add helper for MST-related functions Kunal Joshi
2025-02-10 7:16 ` Nautiyal, Ankit K
2025-02-03 8:12 ` [PATCH i-g-t 3/5] lib/igt_kms: add function to set link params Kunal Joshi
2025-02-11 9:53 ` [i-g-t,3/5] " Murthy, Arun R
2025-02-03 8:12 ` [PATCH i-g-t 4/5] tests/intel/kms_dp_linktraining: add tests for UHBR/NON-UHBR over SST/MST Kunal Joshi
2025-02-04 14:01 ` Sharma, Swati2
2025-02-11 12:39 ` [i-g-t,4/5] " Murthy, Arun R
2025-02-03 8:12 ` [PATCH i-g-t 5/5] HAX: DO NOT MERGE Kunal Joshi
2025-02-04 0:33 ` ✗ i915.CI.BAT: failure for add test to validate uhbr/non-uhbr over sst/mst (rev3) Patchwork
2025-02-04 1:12 ` ✗ Xe.CI.BAT: " Patchwork
2025-02-04 3:07 ` ✗ 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=20250203081241.659139-2-kunal1.joshi@intel.com \
--to=kunal1.joshi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=jeevan.b@intel.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