From: Petri Latvala <petri.latvala@intel.com>
To: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: igt-dev@lists.freedesktop.org, Martin Peres <martin.peres@intel.com>
Subject: Re: [igt-dev] [PATCH i-g-t 2/2] tests/kms_chamelium: Don't fail random palnes tests on invalid config
Date: Thu, 12 Mar 2020 12:12:42 +0200 [thread overview]
Message-ID: <20200312101242.GA9497@platvala-desk.ger.corp.intel.com> (raw)
In-Reply-To: <20200312095137.551252-2-arkadiusz.hiler@intel.com>
On Thu, Mar 12, 2020 at 11:51:37AM +0200, Arkadiusz Hiler wrote:
> It is possible to generate a configuration that the driver rejects
> because it cannot be handled (e.g. exceeding the number of available
> scalers). Until now the test was failing in such cases with:
>
> igt_kms-CRITICAL: Test assertion failure function igt_display_commit_atomic, file ../lib/igt_kms.c:3490:
> igt_kms-CRITICAL: Failed assertion: ret == 0
> igt_kms-CRITICAL: Last errno: 22, Invalid argument
> igt_kms-CRITICAL: error: -22 != 0
>
> With this change we will just note that the atomic commit is invalid and
> pass the test without causing random noise.
>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Martin Peres <martin.peres@intel.com>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> ---
> tests/kms_chamelium.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c
> index 8046ac65..b563cce4 100644
> --- a/tests/kms_chamelium.c
> +++ b/tests/kms_chamelium.c
> @@ -2402,6 +2402,7 @@ static void test_display_planes_random(data_t *data,
> bool allow_yuv;
> unsigned int i;
> unsigned int fb_id;
> + int ret;
>
> switch (check) {
> case CHAMELIUM_CHECK_CRC:
> @@ -2478,7 +2479,15 @@ static void test_display_planes_random(data_t *data,
> fb_crc = chamelium_calculate_fb_crc_async_start(data->drm_fd,
> &result_fb);
>
> - igt_display_commit2(&data->display, COMMIT_ATOMIC);
> + ret = igt_display_try_commit2(&data->display, COMMIT_ATOMIC);
> +
> + /* we have invalid configuration, noting we can do */
I'm noting that there's nothing we can do.
--
Petri Latvala
> + if (ret == -EINVAL) {
> + igt_info("The random plane configuration is invalid, "
> + "passing the test without testing anything.\n");
> + goto cleanup;
> + }
> +
>
> if (check == CHAMELIUM_CHECK_CRC) {
> chamelium_capture(data->chamelium, port, 0, 0, 0, 0, 1);
> @@ -2505,6 +2514,8 @@ static void test_display_planes_random(data_t *data,
> chamelium_destroy_frame_dump(dump);
> }
>
> +cleanup:
> +
> for (i = 0; i < overlay_planes_count; i++)
> igt_remove_fb(data->drm_fd, &overlay_fbs[i]);
>
> --
> 2.24.1
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-03-12 10:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 9:51 [igt-dev] [PATCH i-g-t 1/2] tests/kms_chamelium: Don't use CCS modifiers in random plane setup Arkadiusz Hiler
2020-03-12 9:51 ` [igt-dev] [PATCH i-g-t 2/2] tests/kms_chamelium: Don't fail random palnes tests on invalid config Arkadiusz Hiler
2020-03-12 10:12 ` Petri Latvala [this message]
2020-03-12 11:15 ` Peres, Martin
2020-03-12 11:23 ` Arkadiusz Hiler
2020-03-12 10:47 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] tests/kms_chamelium: Don't use CCS modifiers in random plane setup Patchwork
2020-03-13 3:20 ` [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=20200312101242.GA9497@platvala-desk.ger.corp.intel.com \
--to=petri.latvala@intel.com \
--cc=arkadiusz.hiler@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=martin.peres@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox