diff options
| author | Stanislav Lisovskiy <stanislav.lisovskiy@gmail.com> | 2019-02-19 11:38:00 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2019-03-06 14:53:51 +0200 |
| commit | 91908d36d0d5c90eea86e29736d2748d5ec55335 (patch) | |
| tree | c3483fee72abcafa461a5a0b4b20c820c7e4660e /tests/kms_atomic_transition.c | |
| parent | a382aeec489a187591677644cc3b98e34322b474 (diff) | |
igt/tests: Fix error checking in kms_atomic_transition
There is no guarantee that error return value will be
always EINVAL, made a check more general as it can be
ERANGE, ENOSPC, EINVAL and probably others, which all
mean the same in context of this test case: i.e this sprite
size is not valid.
v2: Added macro to make check look a bit nicer.
v3: Removed redundant debug line.
v4: Added assertion if error is not EINVAL as expected,
other errors except EINVAL are considered now a failures.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109225
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Reviewed-by: Stuart Summers <stuart.summers@intel.com>
Diffstat (limited to 'tests/kms_atomic_transition.c')
| -rw-r--r-- | tests/kms_atomic_transition.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index ec5d25de..18f73317 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -188,6 +188,12 @@ static void set_sprite_wh(igt_display_t *display, enum pipe pipe, LOCAL_DRM_FORMAT_MOD_NONE, sprite_fb); } +#define is_atomic_check_failure_errno(errno) \ + (errno != -EINVAL && errno != 0) + +#define is_atomic_check_plane_size_errno(errno) \ + (errno == -EINVAL) + static void setup_parms(igt_display_t *display, enum pipe pipe, const drmModeModeInfo *mode, struct igt_fb *primary_fb, @@ -281,8 +287,9 @@ retry: wm_setup_plane(display, pipe, (1 << n_planes) - 1, parms, false); ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); + igt_assert(!is_atomic_check_failure_errno(ret)); - if (ret == -EINVAL) { + if (is_atomic_check_plane_size_errno(ret)) { if (cursor_width == sprite_width && cursor_height == sprite_height) { igt_assert_f(alpha, @@ -472,7 +479,9 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output igt_pipe_request_out_fence(pipe_obj); ret = igt_display_try_commit_atomic(display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); - if (ret != -EINVAL || pipe_obj->n_planes < 3) + igt_assert(!is_atomic_check_failure_errno(ret)); + + if (!is_atomic_check_plane_size_errno(ret) || pipe_obj->n_planes < 3) break; ret = 0; |