diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index e2225e62..08baa062 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1227,10 +1227,14 @@ void igt_output_set_pipe(igt_output_t *output, enum pipe pipe)
 {
 	igt_display_t *display = output->display;
 
-	LOG(display, "%s: set_pipe(%c)\n", igt_output_name(output),
-	    pipe_name(pipe));
-
-	output->pending_crtc_idx_mask = 1 << pipe;
+	if (pipe == PIPE_ANY) {
+		LOG(display, "%s: set_pipe(any)\n", igt_output_name(output));
+		output->pending_crtc_idx_mask = -1UL;
+	} else {
+		LOG(display, "%s: set_pipe(%c)\n", igt_output_name(output),
+		    pipe_name(pipe));
+		output->pending_crtc_idx_mask = 1 << pipe;
+	}
 }
 
 igt_plane_t *igt_ouput_get_plane(igt_output_t *output, enum igt_plane plane)
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index e86cff4e..07cf8a21 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -170,6 +170,12 @@ void igt_plane_set_position(igt_plane_t *plane, int x, int y);
 	for (int i__ = 0;  i__ < (display)->n_outputs; i__++)	\
 		if ((output = &(display)->outputs[i__]), output->valid)
 
+/*
+ * Can be used with igt_output_set_pipe() to mean we don't care about the pipe
+ * that should drive this output
+ */
+#define PIPE_ANY	(-1)
+
 #define IGT_FIXED(i,f)	((i) << 16 | (f))
 
 #endif /* __IGT_KMS_H__ */