Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Gil Dekel <gildekel@google.com>
To: igt-dev@lists.freedesktop.org
Cc: Gil Dekel <gildekel@google.com>,
	 Thadeu Lima de Souza Cascardo <cascardo@igalia.com>,
	Kamil Konieczny <kamil.konieczny@linux.intel.com>,
	 Mark Yacoub <markyacoub@google.com>
Subject: [PATCH i-g-t v2] lib/igt_kms: Skip connectors that can't scan out
Date: Sat, 14 Nov 2026 19:18:50 -0500	[thread overview]
Message-ID: <20261115001850.2931093-1-gildekel@google.com> (raw)
In-Reply-To: <20261114222855.1403127-1-gildekel@google.com>

igt_output_is_connected() trusts the connector status alone. Some
drivers expose writeback outputs as always-connected
DRM_MODE_CONNECTOR_VIRTUAL connectors next to their eDP and DP
connectors; the downstream msm SDE driver is one. IGT then picks such
a connector as a display. Its first modeset fails with -EINVAL because
no writeback framebuffer is attached, and every test that calls
igt_display_require() fails in its fixture.

Commit 321448df7fc9 ("lib/igt_kms: Do not treat writeback and virtual
connectors as connected") skipped all virtual connectors. It broke VKMS,
which has nothing but virtual connectors, and was reverted.

In igt_display_reset_outputs(), classify each output from the uAPI
alone:
- Writeback connectors, and any connector exposing WRITEBACK_FB_ID,
  are never scanout sinks.
- On devices that only expose virtual connectors (VKMS, virtio-gpu,
  vmwgfx, ...), the virtual connectors are the displays and are left
  alone.
- Next to physical connectors, a connected virtual connector is hidden
  only if the kernel rejects a TEST_ONLY commit that lights it up with
  a plain XRGB8888 primary plane on every CRTC it can use. If the probe
  can't be sent (no atomic cap, or not DRM master), the connector is
  kept.

igt_output_is_connected() honours non_scanout_sink. kms_setmode
enumerates connectors on a legacy fd, so it initializes a temporary
igt_display_t in its fixture to classify them and drops the atomic cap
afterwards. kms_writeback walks for_each_output() and still finds its
connector.

Cc: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Cc: Mark Yacoub <markyacoub@google.com>
Assisted-by: Claude:claude-opus-5.5
Signed-off-by: Gil Dekel <gildekel@google.com>
---

Notes:
    v2: Apologies for the over-engineered v1 bloat from agent-assisted
        drafting; replace custom libdrm dumb-buffer probing with an
        igt_display_t/igt_fb TEST_ONLY probe in
        igt_display_reset_outputs().

 lib/igt_kms.c       | 79 +++++++++++++++++++++++++++++++++++++++++++++
 lib/igt_kms.h       |  8 +++--
 tests/kms_setmode.c | 26 +++++++++++++++
 3 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 915c6a8a2..ba9e39062 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -2823,6 +2823,7 @@ void igt_display_reset(igt_display_t *display)
 
 static void igt_fill_plane_format_mod(igt_display_t *display, igt_plane_t *plane);
 static void igt_fill_display_format_mod(igt_display_t *display);
+static int igt_atomic_commit(igt_display_t *display, uint32_t flags, void *user_data);
 
 static bool igt_crtc_has_valid_output(igt_crtc_t *crtc)
 {
@@ -2883,6 +2884,52 @@ static void igt_handle_spurious_hpd(igt_display_t *display)
 	dump_connector_attrs();
 }
 
+static bool connector_type_is_physical(uint32_t connector_type)
+{
+	return connector_type != DRM_MODE_CONNECTOR_VIRTUAL &&
+	       connector_type != DRM_MODE_CONNECTOR_WRITEBACK;
+}
+
+static bool virtual_output_can_scanout(igt_display_t *display,
+				       igt_output_t *output)
+{
+	drmModeModeInfo *mode = igt_output_get_mode(output);
+	struct igt_fb fb;
+	igt_crtc_t *crtc;
+	int ret = -ENODEV;
+
+	if (!display->is_atomic || !mode ||
+	    igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay,
+			  DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb) <= 0)
+		return true;
+
+	for_each_crtc(display, crtc) {
+		igt_plane_t *primary, *orig_ref;
+
+		if (!(output->config.valid_crtc_index_mask &
+		      (1 << crtc->crtc_index)))
+			continue;
+
+		igt_output_set_crtc(output, crtc);
+		primary = igt_output_get_plane_type(output,
+						    DRM_PLANE_TYPE_PRIMARY);
+		orig_ref = primary->ref->ref;
+		igt_plane_set_fb(primary, &fb);
+		ret = igt_atomic_commit(display,
+					DRM_MODE_ATOMIC_TEST_ONLY |
+					DRM_MODE_ATOMIC_ALLOW_MODESET,
+					NULL);
+		igt_plane_set_fb(primary, NULL);
+		igt_plane_set_crtc(orig_ref, orig_ref->crtc);
+		igt_output_set_crtc(output, NULL);
+		if (!ret || ret == -EACCES)
+			break;
+	}
+
+	igt_remove_fb(display->drm_fd, &fb);
+	return !ret || ret == -EACCES;
+}
+
 /**
  * igt_display_reset_outputs:
  * @display: a pointer to an initialized #igt_display_t structure
@@ -2895,6 +2942,7 @@ void igt_display_reset_outputs(igt_display_t *display)
 	igt_crtc_t *crtc;
 	int i;
 	drmModeRes *resources;
+	bool has_physical = false;
 
 	/* Clear any existing outputs*/
 	if (display->n_outputs) {
@@ -2947,6 +2995,37 @@ void igt_display_reset_outputs(igt_display_t *display)
 	 * display. */
 	igt_display_reset(display);
 
+	for (i = 0; i < display->n_outputs; i++) {
+		drmModeConnector *c = display->outputs[i].config.connector;
+
+		if (c && connector_type_is_physical(c->connector_type)) {
+			has_physical = true;
+			break;
+		}
+	}
+
+	for (i = 0; i < display->n_outputs; i++) {
+		igt_output_t *output = &display->outputs[i];
+		drmModeConnector *c = output->config.connector;
+
+		if (!c)
+			continue;
+
+		if (c->connector_type == DRM_MODE_CONNECTOR_WRITEBACK ||
+		    output->props[IGT_CONNECTOR_WRITEBACK_FB_ID]) {
+			output->non_scanout_sink = true;
+		} else if (c->connector_type == DRM_MODE_CONNECTOR_VIRTUAL &&
+			   has_physical &&
+			   c->connection == DRM_MODE_CONNECTED &&
+			   c->count_modes) {
+			output->non_scanout_sink =
+				!virtual_output_can_scanout(display, output);
+			if (output->non_scanout_sink)
+				igt_info("%s: not a scanout sink, not used as a display\n",
+					 output->name);
+		}
+	}
+
 	for_each_crtc(display, crtc) {
 		igt_output_t *output;
 
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index dfcb91e02..ae8de13d2 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -512,6 +512,7 @@ typedef struct {
 	struct kmstest_connector_config config;
 	char *name;
 	bool force_reprobe;
+	bool non_scanout_sink;
 	igt_crtc_t *pending_crtc;
 	bool use_override_mode;
 	drmModeModeInfo override_mode;
@@ -668,14 +669,15 @@ void igt_wait_for_vblank_ts_seq(igt_crtc_t *crtc, uint64_t *ts_ns, unsigned int
  * igt_output_is_connected:
  * @output: #igt_output_t to check.
  *
- * Returns: True if given @output's connection status is CONNECTED,
- * else False.
+ * Returns: True if given @output is a scanout sink whose connection
+ * status is CONNECTED, else False.
  */
 static inline bool igt_output_is_connected(igt_output_t *output)
 {
 	/* Something went wrong during probe? */
 	if (!output->config.connector ||
-	    !output->config.connector->count_modes)
+	    !output->config.connector->count_modes ||
+	    output->non_scanout_sink)
 		return false;
 
 	if (output->config.connector->connection == DRM_MODE_CONNECTED)
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index a65ea8b23..86839fb6f 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -92,6 +92,7 @@
 
 static int drm_fd;
 static drmModeRes *drm_resources;
+static bool *non_scanout_sink;
 static int filter_test_id;
 static bool dry_run;
 static bool extended = false;
@@ -895,6 +896,9 @@ static int get_connectors(drmModeRes *resources, int *connector_idxs,
 		igt_assert_lt(connector_idx, resources->count_connectors);
 		connector_id = resources->connectors[connector_idx];
 
+		if (non_scanout_sink[connector_idx])
+			goto err;
+
 		if (get_one_connector(resources, connector_id, &cconfs[i]) < 0)
 			goto err;
 
@@ -1047,6 +1051,25 @@ static void restore_cpu_deep_sleep_at_exit(int sig)
 	igt_pm_enable_cpu_deep_sleep();
 }
 
+static void find_non_scanout_sinks(void)
+{
+	igt_display_t display;
+
+	non_scanout_sink = calloc(drm_resources->count_connectors,
+				  sizeof(*non_scanout_sink));
+	igt_assert(non_scanout_sink);
+	if (dry_run || !drm_resources->count_connectors ||
+	    !drm_resources->count_crtcs)
+		return;
+
+	igt_display_require(&display, drm_fd);
+	for (int i = 0; i < display.n_outputs &&
+	     i < drm_resources->count_connectors; i++)
+		non_scanout_sink[i] = display.outputs[i].non_scanout_sink;
+	igt_display_fini(&display);
+	drmSetClientCap(drm_fd, DRM_CLIENT_CAP_ATOMIC, 0);
+}
+
 static int opt_handler(int opt, int opt_index, void *data)
 {
 	switch (opt) {
@@ -1103,6 +1126,8 @@ int igt_main_args("det:", NULL, help_str, opt_handler, NULL)
 		drm_resources = drmModeGetResources(drm_fd);
 		igt_require(drm_resources);
 
+		find_non_scanout_sinks();
+
 		max_dotclock = igt_get_max_dotclock(drm_fd);
 	}
 
@@ -1143,6 +1168,7 @@ int igt_main_args("det:", NULL, help_str, opt_handler, NULL)
 	}
 
 	igt_fixture() {
+		free(non_scanout_sink);
 		drmModeFreeResources(drm_resources);
 		drm_close_driver(drm_fd);
 	}
-- 
Gil Dekel, Software Engineer, Google / ChromeOS Display and Graphics


  reply	other threads:[~2026-11-16  5:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-14 22:28 [PATCH i-g-t] lib/igt_kms: Skip connectors that can't scan out Gil Dekel
2026-11-15  0:18 ` Gil Dekel [this message]
2026-11-16  6:08 ` ✓ Xe.CI.BAT: success for lib/igt_kms: Skip connectors that can't scan out (rev2) Patchwork
2026-11-16  6:28 ` ✓ i915.CI.BAT: " Patchwork
2026-11-16  7:39 ` ✓ Xe.CI.FULL: " Patchwork
2026-11-16  9:01 ` ✗ i915.CI.Full: failure " Patchwork
2026-11-16 10:09 ` [PATCH i-g-t] lib/igt_kms: Skip connectors that can't scan out Jani Nikula
2026-11-17  3:13   ` Gil Dekel

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=20261115001850.2931093-1-gildekel@google.com \
    --to=gildekel@google.com \
    --cc=cascardo@igalia.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=kamil.konieczny@linux.intel.com \
    --cc=markyacoub@google.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