From 26bec97c21bbff761231e350dfea47f1a02e2e99 Mon Sep 17 00:00:00 2001 From: "Feceoru, Gabriel" Date: Fri, 26 Feb 2016 13:21:15 +0200 Subject: [PATCH] lib/igt_kms: Add fail exit branch in do_display_commit() On Cherryview PIPE_C can only be connected to PORT_D (bspec). The driver properly reports the crtc_mask for the encoder, however the mismatch between pipe and port is not reported back to the test. Add support for detecting this case so the test can be skipped. v2: Apply review comments (Marius) Signed-off-by: Gabriel Feceoru Signed-off-by: Marius Vlad --- lib/igt_kms.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 7557bdc2..4da645a7 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2110,6 +2110,7 @@ static int do_display_commit(igt_display_t *display, bool fail_on_error) { int i, ret; + int valid_outs = 0; LOG_INDENT(display, "commit"); @@ -2129,12 +2130,16 @@ static int do_display_commit(igt_display_t *display, if (!output->valid) continue; + valid_outs++; ret = igt_output_commit(output, s, fail_on_error); CHECK_RETURN(ret, fail_on_error); } LOG_UNINDENT(display); + if (valid_outs == 0) + return -1; + igt_debug_wait_for_keypress("modeset"); return 0;