From: Daniel Vetter <daniel@ffwll.ch>
To: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Cc: ville.syrjala@intel.com, martin.peres@intel.com,
igt-dev@lists.freedesktop.org
Subject: Re: [igt-dev] [PATCH i-g-t v1 3/3] igt/tests: Tolerate if kernel can't have all planes
Date: Mon, 1 Apr 2019 09:28:47 +0200 [thread overview]
Message-ID: <20190401072847.GU2665@phenom.ffwll.local> (raw)
In-Reply-To: <20190329112901.27830-4-stanislav.lisovskiy@intel.com>
On Fri, Mar 29, 2019 at 01:29:01PM +0200, Stanislav Lisovskiy wrote:
> With some upcoming changes i915 might not allow
> all sprite planes enabled, depending on available
> bandwidth limitation. Thus the test need to decrement
> amount of planes and try again, instead of panicking.
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
I'm looking at a similar problem in kms_concurrent, and I think we now
also need to randomize the planes we pick. With bw limits (and other stuff
really, this is just the one we're hitting now) we'd otherwise have a good
chance of not testing the last few planes. By randomizing which planes
we're picking we should be able to make things a lot more interesting for
the kernel.
-Daniel
> ---
> tests/kms_atomic_transition.c | 25 ++++++++++++++++++-------
> 1 file changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index ed271532..657a7d1c 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -215,6 +215,7 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> uint32_t n_overlays;
> igt_plane_t *plane;
> uint32_t iter_mask;
> + int retries = n_planes - 1;
>
> do_or_die(drmGetCap(display->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width));
> if (cursor_width >= mode->hdisplay)
> @@ -224,6 +225,7 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> if (cursor_height >= mode->vdisplay)
> cursor_height = mode->vdisplay;
>
> +retry:
> n_overlays = 0;
> iter_mask = 0;
>
> @@ -266,7 +268,6 @@ static void setup_parms(igt_display_t *display, enum pipe pipe,
> * Pre gen9 not all sizes are supported, find the biggest possible
> * size that can be enabled on all sprite planes.
> */
> -retry:
> prev_w = sprite_width = cursor_width;
> prev_h = sprite_height = cursor_height;
>
> @@ -286,12 +287,22 @@ retry:
> if (is_atomic_check_plane_size_errno(ret)) {
> if (cursor_width == sprite_width &&
> cursor_height == sprite_height) {
> - igt_assert_f(alpha,
> - "Cannot configure the test with all sprite planes enabled\n");
> -
> - /* retry once with XRGB format. */
> - alpha = false;
> - goto retry;
> + if (--retries >= 0) {
> + /* retry once with XRGB format. */
> + if (alpha) {
> + alpha = false;
> + }
> + else if (display->pipes[pipe].n_planes > 0) {
> + display->pipes[pipe].n_planes--;
> + igt_info("Reduced available planes to %d\n",
> + display->pipes[pipe].n_planes);
> + }
> + n_planes = display->pipes[pipe].n_planes;
> + igt_assert_f(n_planes > 0, "No planes left to proceed with!");
> + goto retry;
> + }
> + igt_assert_f(retries > 0,
> + "Cannot configure the test with all sprite planes enabled\n");
> }
>
> sprite_width = prev_w;
> --
> 2.17.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-04-01 7:28 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 ` [igt-dev] [PATCH i-g-t v1 1/3] igt/tests/kms_atomic_transition: Skip transition, if no changes done Stanislav Lisovskiy
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 [this message]
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=20190401072847.GU2665@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=igt-dev@lists.freedesktop.org \
--cc=martin.peres@intel.com \
--cc=stanislav.lisovskiy@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.