lib/igt_kms: Add igt_display_require_output(/on_pipe)

Most KMS users open code this.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

2 files changed, 26 insertions, 0 deletions

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 5e2ef97b..2d775106 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1845,6 +1845,30 @@ int igt_display_get_n_pipes(igt_display_t *display)
 	return display->n_pipes;
 }
 
+void igt_display_require_output(igt_display_t *display)
+{
+	enum pipe pipe;
+	igt_output_t *output;
+
+	for_each_pipe_with_valid_output(display, pipe, output)
+		return;
+
+	igt_skip("No valid crtc/connector combinations found.\n");
+}
+
+void igt_display_require_output_on_pipe(igt_display_t *display, enum pipe pipe)
+{
+	igt_output_t *output;
+
+	igt_skip_on_f(igt_display_get_n_pipes(display) < pipe,
+		      "Pipe %s does not exist.\n", kmstest_pipe_name(pipe));
+
+	for_each_valid_output_on_pipe(display, pipe, output)
+		return;
+
+	igt_skip("No valid connector found on pipe %s\n", kmstest_pipe_name(pipe));
+}
+
 /**
  * igt_output_from_connector:
  * @display: a pointer to an #igt_display_t structure
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 9567a26a..0ef5d9d7 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -380,6 +380,8 @@ int  igt_display_try_commit_atomic(igt_display_t *display, uint32_t flags, void
 void igt_display_commit_atomic(igt_display_t *display, uint32_t flags, void *user_data);
 int  igt_display_try_commit2(igt_display_t *display, enum igt_commit_style s);
 int  igt_display_get_n_pipes(igt_display_t *display);
+void igt_display_require_output(igt_display_t *display);
+void igt_display_require_output_on_pipe(igt_display_t *display, enum pipe pipe);
 
 const char *igt_output_name(igt_output_t *output);
 drmModeModeInfo *igt_output_get_mode(igt_output_t *output);