Re: [PATCH 2/3] drm/format-helper: Add KUnit tests for drm_fb_xrgb8888_to_xrgb2101010()

[David Gow <davidgow@xxxxxxxxxx>]

On Tue, Aug 16, 2022 at 6:29 PM José Expósito <jose.exposito89@xxxxxxxxx> wrote:
>
> Extend the existing test cases to test the conversion from XRGB8888 to
> XRGB2101010.
>
> Signed-off-by: José Expósito <jose.exposito89@xxxxxxxxx>
> ---

This looks good.

Again, it'd be nice to use KUNIT_EXPECT_MEMEQ() when it's available,
but if you don't want to add a dependency on that patchset now,
keeping it as-is in this patch and fixing it later is also fine.

Reviewed-by: David Gow <davidgow@xxxxxxxxxx>

Cheers,
-- David

>  .../gpu/drm/tests/drm_format_helper_test.c    | 63 +++++++++++++++++++
>  1 file changed, 63 insertions(+)
>
> diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c
> index 08d08e7ab19a..d8536db4de1e 100644
> --- a/drivers/gpu/drm/tests/drm_format_helper_test.c
> +++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
> @@ -32,6 +32,11 @@ struct convert_to_rgb888_result {
>         const u8 expected[TEST_BUF_SIZE];
>  };
>
> +struct convert_to_xrgb2101010_result {
> +       unsigned int dst_pitch;
> +       const u32 expected[TEST_BUF_SIZE];
> +};
> +
>  struct convert_xrgb8888_case {
>         const char *name;
>         unsigned int pitch;
> @@ -40,6 +45,7 @@ struct convert_xrgb8888_case {
>         struct convert_to_rgb332_result rgb332_result;
>         struct convert_to_rgb565_result rgb565_result;
>         struct convert_to_rgb888_result rgb888_result;
> +       struct convert_to_xrgb2101010_result xrgb2101010_result;
>  };
>
>  static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
> @@ -61,6 +67,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
>                         .dst_pitch = 0,
>                         .expected = { 0x00, 0x00, 0xFF },
>                 },
> +               .xrgb2101010_result = {
> +                       .dst_pitch = 0,
> +                       .expected = { 0x3FF00000 },
> +               },
>         },
>         {
>                 .name = "single_pixel_clip_rectangle",
> @@ -83,6 +93,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
>                         .dst_pitch = 0,
>                         .expected = { 0x00, 0x00, 0xFF },
>                 },
> +               .xrgb2101010_result = {
> +                       .dst_pitch = 0,
> +                       .expected = { 0x3FF00000 },
> +               },
>         },
>         {
>                 /* Well known colors: White, black, red, green, blue, magenta,
> @@ -132,6 +146,15 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
>                                 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
>                         },
>                 },
> +               .xrgb2101010_result = {
> +                       .dst_pitch = 0,
> +                       .expected = {
> +                               0x3FFFFFFF, 0x00000000,
> +                               0x3FF00000, 0x000FFC00,
> +                               0x000003FF, 0x3FF003FF,
> +                               0x3FFFFC00, 0x000FFFFF,
> +                       },
> +               },
>         },
>         {
>                 /* Randomly picked colors. Full buffer within the clip area. */
> @@ -175,6 +198,14 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
>                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
>                         },
>                 },
> +               .xrgb2101010_result = {
> +                       .dst_pitch = 20,
> +                       .expected = {
> +                               0x03844672, 0x0444D414, 0x2A20300C, 0x00000000, 0x00000000,
> +                               0x1B1705CD, 0x03844672, 0x0444D414, 0x00000000, 0x00000000,
> +                               0x2A20300C, 0x1B1705CD, 0x03844672, 0x00000000, 0x00000000,
> +                       },
> +               },
>         },
>  };
>
> @@ -319,10 +350,42 @@ static void xrgb8888_to_rgb888_test(struct kunit *test)
>         KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
>  }
>
> +static void xrgb8888_to_xrgb2101010_test(struct kunit *test)
> +{
> +       const struct convert_xrgb8888_case *params = test->param_value;
> +       const struct convert_to_xrgb2101010_result *result = &params->xrgb2101010_result;
> +       size_t dst_size;
> +       __u32 *buf = NULL;
> +       __u32 *xrgb8888 = NULL;
> +       struct iosys_map dst, src;
> +
> +       struct drm_framebuffer fb = {
> +               .format = drm_format_info(DRM_FORMAT_XRGB8888),
> +               .pitches = { params->pitch, 0, 0 },
> +       };
> +
> +       dst_size = conversion_buf_size(DRM_FORMAT_XRGB2101010,
> +                                      result->dst_pitch, &params->clip);
> +       KUNIT_ASSERT_GT(test, dst_size, 0);
> +
> +       buf = kunit_kzalloc(test, dst_size, GFP_KERNEL);
> +       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf);
> +       iosys_map_set_vaddr(&dst, buf);
> +
> +       xrgb8888 = le32buf_to_cpu(test, params->xrgb8888, TEST_BUF_SIZE);
> +       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xrgb8888);
> +       iosys_map_set_vaddr(&src, xrgb8888);
> +
> +       drm_fb_xrgb8888_to_xrgb2101010(&dst, &result->dst_pitch, &src, &fb, &params->clip);
> +       buf = le32buf_to_cpu(test, buf, TEST_BUF_SIZE);
> +       KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
> +}
> +
>  static struct kunit_case drm_format_helper_test_cases[] = {
>         KUNIT_CASE_PARAM(xrgb8888_to_rgb332_test, convert_xrgb8888_gen_params),
>         KUNIT_CASE_PARAM(xrgb8888_to_rgb565_test, convert_xrgb8888_gen_params),
>         KUNIT_CASE_PARAM(xrgb8888_to_rgb888_test, convert_xrgb8888_gen_params),
> +       KUNIT_CASE_PARAM(xrgb8888_to_xrgb2101010_test, convert_xrgb8888_gen_params),
>         {}
>  };
>
> --
> 2.25.1
>

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature