diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-06-13 17:39:22 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-06-14 10:11:32 +0200 |
| commit | 6311a19d2dcdc611a68f18eaccef7effcc0b7e72 (patch) | |
| tree | 73a37bd444edd4bcb9b0ba8862aca3137c2a423f /lib/igt_kms.c | |
| parent | 0b8933d09978d2845744b1e70bc69acaaeb21f3c (diff) | |
lib/igt_kms: Fix indent when try_commit fails.
First unindent before calling check_return, else when an expected
failure happens, the unindent never happens.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'lib/igt_kms.c')
| -rw-r--r-- | lib/igt_kms.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 2d775106..0815c418 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2670,8 +2670,6 @@ static int do_display_commit(igt_display_t *display, if (s == COMMIT_ATOMIC) { ret = igt_atomic_commit(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); - - CHECK_RETURN(ret, fail_on_error); } else { int valid_outs = 0; @@ -2683,11 +2681,10 @@ static int do_display_commit(igt_display_t *display, valid_outs++; ret = igt_pipe_commit(pipe_obj, s, fail_on_error); - CHECK_RETURN(ret, fail_on_error); + if (ret) + break; } - CHECK_RETURN(ret, fail_on_error); - if (valid_outs == 0) { LOG_UNINDENT(display); @@ -2695,10 +2692,9 @@ static int do_display_commit(igt_display_t *display, } } - LOG_UNINDENT(display); - if (ret) - return ret; + LOG_UNINDENT(display); + CHECK_RETURN(ret, fail_on_error); display_commit_changed(display, s); |