diff options
| author | Feceoru, Gabriel <gabriel.feceoru@intel.com> | 2016-02-26 13:21:15 +0200 |
|---|---|---|
| committer | Marius Vlad <marius.c.vlad@intel.com> | 2016-05-04 13:23:55 +0300 |
| commit | 26bec97c21bbff761231e350dfea47f1a02e2e99 (patch) | |
| tree | 70759342662cb104c4f26b01898187214863de9e /lib | |
| parent | 11a2b0dc8a7bc6224ec3ca34d2f617de8e54b652 (diff) | |
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 <gabriel.feceoru@intel.com>
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/igt_kms.c | 5 |
1 files changed, 5 insertions, 0 deletions
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; |