Re: [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_chamelium: Add support to validate RGB/YUV pixel formats

Kunal Joshi
2020-03-05T15:40:47Z

On 2020-03-05 at 15:01:15 +0200, Ville Syrjälä wrote:
> On Thu, Mar 05, 2020 at 09:03:38AM +0530, Kunal Joshi wrote:
> > Currently, only hard coded pixel formats are validated which are not
> > generic for all the platforms which leads to SKIPS.
> > Added support to validate only those pixel formats which are supported by
> > platform. Both RGB and YUV pixel formats are covered.
> >
> > Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com>
> > ---
> > tests/kms_chamelium.c | 140 +++++++++++++++++++-------------------------------
> > 1 file changed, 54 insertions(+), 86 deletions(-)
> >
> > diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c
> > index 5c4a189..5c96017 100644
> > --- a/tests/kms_chamelium.c
> > +++ b/tests/kms_chamelium.c
> > @@ -2612,6 +2612,14 @@ static const struct edid *get_edid(enum test_edid edid)
> > if (chamelium_port_get_type(port) == \
> > DRM_MODE_CONNECTOR_ ## type__)
> >
> > +#define connector_subtest_start(name__, type__) \
> > + igt_subtest_with_dynamic(name__) \
> > + for_each_port(p, port) \
> > + if (chamelium_port_get_type(port) == \
> > + DRM_MODE_CONNECTOR_ ## type__) {
> > +
> > +#define connector_subtest_end }
> > +
> > static data_t data;
> >
> > IGT_TEST_DESCRIPTION("Tests requiring a Chamelium board");
> > @@ -2817,54 +2825,29 @@ igt_main
> > CHAMELIUM_CHECK_CRC, 3);
> >
> > igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-argb8888", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_ARGB8888,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-abgr8888", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_ABGR8888,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-xrgb8888", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_XRGB8888,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-xbgr8888", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_XBGR8888,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-rgb888", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_RGB888,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-bgr888", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_BGR888,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-rgb565", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_RGB565,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-bgr565", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_BGR565,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-argb1555", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_ARGB1555,
> > - CHAMELIUM_CHECK_CRC, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-crc-xrgb1555", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_XRGB1555,
> > - CHAMELIUM_CHECK_CRC, 1);
> > + connector_subtest_start("hdmi-rgb-pixel-format", HDMIA)
> > + int k;
> > + igt_output_t *output;
> > + igt_plane_t *primary;
> > +
> > + output = prepare_output(&data, port, TEST_EDID_BASE);
> > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> > + igt_assert(primary);
> > +
> > + for (k = 0; k < primary->format_mod_count; k++) {
> > + if (!igt_fb_supported_format(primary->formats[k]))
> > + continue;
> > +
> > + if ((igt_format_is_yuv(primary->formats[k]) ||
> > + primary->modifiers[k] != LOCAL_DRM_FORMAT_MOD_NONE))
> > + continue;
> > +
> > + igt_dynamic_f("testing-format-%c%c%c%c", IGT_FORMAT_ARGS_CODE(primary->formats[k]))
>
> We have a igt_format_str() which is probably better for stuff like this.
>

Thanks ville for pointing that out
I tried using igt_format_str()
but it doesn't seem to support that i tried it like below

igt_dynamic_f("%s",igt_format_str("testing-format-%c%c%c%c",
IGT_FORMAT_ARGS_CODE(primary->formats[k]))

Can i use igt_dynamic_f?
because it also accepts a printf format string
https://drm.pages.freedesktop.org/igt-gpu-tools/igt-gpu-tools-Core.html#igt-subtest-with-dynamic
> > + test_display_one_mode(&data, port, primary->formats[k],
> > + CHAMELIUM_CHECK_CRC,
> > + 1);
> > + }
> > + connector_subtest_end
> >
> > igt_describe(test_display_planes_random_desc);
> > connector_subtest("hdmi-crc-planes-random", HDMIA)
> > @@ -2872,44 +2855,29 @@ igt_main
> > CHAMELIUM_CHECK_CRC);
> >
> > igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-nv12", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_NV12,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-nv16", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_NV16,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-nv21", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_NV21,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-nv61", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_NV61,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-yu12", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_YUV420,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-yu16", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_YUV422,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-yv12", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_YVU420,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > -
> > - igt_describe(test_display_one_mode_desc);
> > - connector_subtest("hdmi-cmp-yv16", HDMIA)
> > - test_display_one_mode(&data, port, DRM_FORMAT_YVU422,
> > - CHAMELIUM_CHECK_CHECKERBOARD, 1);
> > + connector_subtest_start("hdmi-yuv-pixel-format", HDMIA)
> > + int k;
> > + igt_output_t *output;
> > + igt_plane_t *primary;
> > +
> > + output = prepare_output(&data, port, TEST_EDID_BASE);
> > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> > + igt_assert(primary);
> > +
> > + for (k = 0; k < primary->format_mod_count; k++) {
> > + if (!igt_fb_supported_format(primary->formats[k]))
> > + continue;
> > +
> > + if (!(igt_format_is_yuv(primary->formats[k]) &&
> > + primary->modifiers[k] != LOCAL_DRM_FORMAT_MOD_NONE))
> > + continue;
> > +
> > + igt_dynamic_f("testing-format-%c%c%c%c", IGT_FORMAT_ARGS_CODE(primary->formats[k]))
> > + test_display_one_mode(&data, port, primary->formats[k],
> > + CHAMELIUM_CHECK_CHECKERBOARD,
> > + 1);
> > + }
> > + connector_subtest_end
> >
> > igt_describe(test_display_planes_random_desc);
> > connector_subtest("hdmi-cmp-planes-random", HDMIA)
> > --
> > 2.7.4
> >
> > _______________________________________________
> > igt-dev mailing list
> > igt-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/igt-dev
>
> --
> Ville Syrjälä
> Intel