From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: ville.syrjala@intel.com, martin.peres@intel.com,
stanislav.lisovskiy@intel.com
Subject: [igt-dev] [PATCH i-g-t v1 1/3] igt/tests/kms_atomic_transition: Skip transition, if no changes done
Date: Fri, 29 Mar 2019 13:28:59 +0200 [thread overview]
Message-ID: <20190329112901.27830-2-stanislav.lisovskiy@intel.com> (raw)
In-Reply-To: <20190329112901.27830-1-stanislav.lisovskiy@intel.com>
While fixing used amount of planes, discovered that if
wm_setup_plane is called with 0 planes(might happen during
main testing cycle, as parms[i].mask can be 0 due to randomization)
then subsequent wait_transition fails in assertion on fd_completed.
So added return value to wm_setup_plane, which would allow to
determine, if we need to skip this step.
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
tests/kms_atomic_transition.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 18f73317..638fe17e 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -118,11 +118,12 @@ static void configure_fencing(igt_plane_t *plane)
igt_assert_eq(ret, 0);
}
-static void
+static int
wm_setup_plane(igt_display_t *display, enum pipe pipe,
uint32_t mask, struct plane_parms *parms, bool fencing)
{
igt_plane_t *plane;
+ int planes_set_up = 0;
/*
* Make sure these buffers are suited for display use
@@ -133,8 +134,10 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
int i = plane->index;
if (!mask || !(parms[i].mask & mask)) {
- if (plane->values[IGT_PLANE_FB_ID])
+ if (plane->values[IGT_PLANE_FB_ID]) {
igt_plane_set_fb(plane, NULL);
+ planes_set_up++;
+ }
continue;
}
@@ -144,7 +147,10 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
igt_plane_set_fb(plane, parms[i].fb);
igt_fb_set_size(parms[i].fb, plane, parms[i].width, parms[i].height);
igt_plane_set_size(plane, parms[i].width, parms[i].height);
+
+ planes_set_up++;
}
+ return planes_set_up;
}
static void ev_page_flip(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, void *user_data)
@@ -544,7 +550,8 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
igt_output_set_pipe(output, pipe);
- wm_setup_plane(display, pipe, i, parms, fencing);
+ if (!wm_setup_plane(display, pipe, i, parms, fencing))
+ continue;
atomic_commit(display, pipe, flags, (void *)(unsigned long)i, fencing);
wait_for_transition(display, pipe, nonblocking, fencing);
@@ -552,7 +559,8 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
if (type == TRANSITION_MODESET_DISABLE) {
igt_output_set_pipe(output, PIPE_NONE);
- wm_setup_plane(display, pipe, 0, parms, fencing);
+ if (!wm_setup_plane(display, pipe, 0, parms, fencing))
+ continue;
atomic_commit(display, pipe, flags, (void *) 0UL, fencing);
wait_for_transition(display, pipe, nonblocking, fencing);
@@ -568,7 +576,8 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
n_enable_planes < pipe_obj->n_planes)
continue;
- wm_setup_plane(display, pipe, j, parms, fencing);
+ if (!wm_setup_plane(display, pipe, j, parms, fencing))
+ continue;
if (type >= TRANSITION_MODESET)
igt_output_override_mode(output, &override_mode);
@@ -576,7 +585,9 @@ run_transition_test(igt_display_t *display, enum pipe pipe, igt_output_t *output
atomic_commit(display, pipe, flags, (void *)(unsigned long) j, fencing);
wait_for_transition(display, pipe, nonblocking, fencing);
- wm_setup_plane(display, pipe, i, parms, fencing);
+ if (!wm_setup_plane(display, pipe, i, parms, fencing))
+ continue;
+
if (type >= TRANSITION_MODESET)
igt_output_override_mode(output, NULL);
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-03-29 11:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-29 11:28 [igt-dev] [PATCH i-g-t v1 0/3] kms_atomic_transition improvements Stanislav Lisovskiy
2019-03-29 11:28 ` Stanislav Lisovskiy [this message]
2019-03-29 11:29 ` [igt-dev] [PATCH i-g-t v1 2/3] igt/tests: Remove redundant code in kms_atomic_transition Stanislav Lisovskiy
2019-03-29 11:29 ` [igt-dev] [PATCH i-g-t v1 3/3] igt/tests: Tolerate if kernel can't have all planes Stanislav Lisovskiy
2019-04-01 7:28 ` Daniel Vetter
2019-04-01 7:30 ` Daniel Vetter
2019-04-01 7:40 ` Daniel Vetter
2019-03-29 12:18 ` [igt-dev] ✓ Fi.CI.BAT: success for kms_atomic_transition improvements Patchwork
2019-03-29 14:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190329112901.27830-2-stanislav.lisovskiy@intel.com \
--to=stanislav.lisovskiy@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=martin.peres@intel.com \
--cc=ville.syrjala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.