From: Martin Peres <martin.peres@linux.intel.com>
To: Simon Ser <simon.ser@intel.com>, igt-dev@lists.freedesktop.org
Cc: martin.peres@intel.com
Subject: Re: [igt-dev] [PATCH i-g-t 3/3] tests/kms_chamelium: add an audio EDID test
Date: Wed, 12 Jun 2019 13:47:59 +0300 [thread overview]
Message-ID: <628b79f0-8a77-0395-e319-efd0a65b5ffa@linux.intel.com> (raw)
In-Reply-To: <20190606114852.24053-4-simon.ser@intel.com>
On 06/06/2019 14:48, Simon Ser wrote:
> This test enables a Chamelium port with an audio-friendly EDID, and then checks
> that the EDID-Like Data exposed by ALSA matches our expectations.
>
> Signed-off-by: Simon Ser <simon.ser@intel.com>
> ---
> tests/kms_chamelium.c | 58 +++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 58 insertions(+)
>
> diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c
> index 3beea0c623bd..1a5271bb770f 100644
> --- a/tests/kms_chamelium.c
> +++ b/tests/kms_chamelium.c
> @@ -28,6 +28,7 @@
> #include "igt.h"
> #include "igt_vc4.h"
> #include "igt_edid.h"
> +#include "igt_eld.h"
>
> #include <fcntl.h>
> #include <pthread.h>
> @@ -1428,6 +1429,55 @@ test_display_audio(data_t *data, struct chamelium_port *port,
> free(alsa);
> }
>
> +static void
> +test_display_audio_edid(data_t *data, struct chamelium_port *port,
> + enum test_edid edid)
> +{
> + igt_output_t *output;
> + igt_plane_t *primary;
> + struct igt_fb fb;
> + drmModeModeInfo *mode;
> + drmModeConnector *connector;
> + int fb_id;
> + struct eld_entry eld;
> + struct eld_sad *sad;
> +
> + reset_state(data, port);
> +
> + output = prepare_output(data, port, edid);
> + connector = chamelium_port_get_connector(data->chamelium, port, false);
> + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> + igt_assert(primary);
> +
> + /* Enable the output because audio cannot be played on inactive
> + * connectors. */
> + igt_assert(connector->count_modes > 0);
> + mode = &connector->modes[0];
> +
> + fb_id = igt_create_color_pattern_fb(data->drm_fd,
> + mode->hdisplay, mode->vdisplay,
> + DRM_FORMAT_XRGB8888,
> + LOCAL_DRM_FORMAT_MOD_NONE,
> + 0, 0, 0, &fb);
> + igt_assert(fb_id > 0);
> +
> + enable_output(data, port, output, mode, &fb);
> +
> + igt_assert(eld_get_igt(&eld));
> + igt_assert(eld.sads_len == 1);
> +
> + sad = &eld.sads[0];
> + igt_assert(sad->coding_type == CEA_SAD_FORMAT_PCM);
> + igt_assert(sad->channels == 2);
> + igt_assert(sad->rates == (CEA_SAD_SAMPLING_RATE_32KHZ |
> + CEA_SAD_SAMPLING_RATE_44KHZ | CEA_SAD_SAMPLING_RATE_48KHZ));
> + igt_assert(sad->bits == (CEA_SAD_SAMPLE_SIZE_16 |
> + CEA_SAD_SAMPLE_SIZE_20 | CEA_SAD_SAMPLE_SIZE_24));
If we have only one tests for one EDID, I would suggest trying more
coding_types and channels to make it less typical (we want to detect
hardcoded values).
With channels = 8 and a couple of other coding_types, the patch is:
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
Any plans on generating broken ELDs and seeing how Alsa parses that?
Martin
> +
> + igt_remove_fb(data->drm_fd, &fb);
> +
> + drmModeFreeConnector(connector);
> +}
>
> static void randomize_plane_stride(data_t *data,
> uint32_t width, uint32_t height,
> @@ -2118,6 +2168,10 @@ igt_main
> connector_subtest("dp-audio", DisplayPort)
> test_display_audio(&data, port, "HDMI",
> TEST_EDID_DP_AUDIO);
> +
> + connector_subtest("dp-audio-edid", DisplayPort)
> + test_display_audio_edid(&data, port,
> + TEST_EDID_DP_AUDIO);
> }
>
> igt_subtest_group {
> @@ -2269,6 +2323,10 @@ igt_main
> connector_subtest("hdmi-audio", HDMIA)
> test_display_audio(&data, port, "HDMI",
> TEST_EDID_HDMI_AUDIO);
> +
> + connector_subtest("hdmi-audio-edid", HDMIA)
> + test_display_audio_edid(&data, port,
> + TEST_EDID_HDMI_AUDIO);
> }
>
> igt_subtest_group {
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-06-12 10:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-06 11:48 [igt-dev] [PATCH i-g-t v2 0/3] Add audio EDID tests to Chamelium Simon Ser
2019-06-06 11:48 ` [igt-dev] [PATCH i-g-t 1/3] lib/igt_kms: generate an EDID suitable for DP audio Simon Ser
2019-06-12 10:31 ` Martin Peres
2019-06-12 10:54 ` Ser, Simon
2019-06-06 11:48 ` [igt-dev] [PATCH i-g-t 2/3] lib/igt_eld: add eld_get_igt Simon Ser
2019-06-12 10:37 ` Martin Peres
2019-06-06 11:48 ` [igt-dev] [PATCH i-g-t 3/3] tests/kms_chamelium: add an audio EDID test Simon Ser
2019-06-12 10:47 ` Martin Peres [this message]
2019-06-12 11:35 ` Ser, Simon
2019-06-12 12:24 ` Martin Peres
2019-06-12 12:52 ` Ser, Simon
2019-06-12 13:09 ` Martin Peres
2019-06-06 13:47 ` [igt-dev] ✓ Fi.CI.BAT: success for Add audio EDID tests to Chamelium (rev3) Patchwork
2019-06-08 16:11 ` [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=628b79f0-8a77-0395-e319-efd0a65b5ffa@linux.intel.com \
--to=martin.peres@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=martin.peres@intel.com \
--cc=simon.ser@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