tests: Add calls to drm_fb_blit() on supported format conversion tests

Arthur Grillo Mon, 18 Sep 2023 15:57:39 -0700

Add a call to drm_fb_blit() on existing format conversion tests that
has support.


Signed-off-by: Arthur Grillo <arthurgri...@riseup.net>
---
 drivers/gpu/drm/tests/drm_format_helper_test.c | 143 +++++++++++++++++++++++++
 1 file changed, 143 insertions(+)

diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c 
b/drivers/gpu/drm/tests/drm_format_helper_test.c
index 1a6bd291345d..9cad723ada9d 100644
--- a/drivers/gpu/drm/tests/drm_format_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
@@ -643,6 +643,18 @@ static void drm_test_fb_xrgb8888_to_rgb565(struct kunit 
*test)
        drm_fb_xrgb8888_to_rgb565(&dst, &result->dst_pitch, &src, &fb, 
&params->clip, true);
        buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected_swab, dst_size);
+
+       buf = dst.vaddr;
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_RGB565, &src, 
&fb, &params->clip);
+
+       buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_xrgb1555(struct kunit *test)
@@ -677,6 +689,18 @@ static void drm_test_fb_xrgb8888_to_xrgb1555(struct kunit 
*test)
        drm_fb_xrgb8888_to_xrgb1555(&dst, dst_pitch, &src, &fb, &params->clip);
        buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_XRGB1555, &src, 
&fb, &params->clip);
+
+       buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_argb1555(struct kunit *test)
@@ -711,6 +735,18 @@ static void drm_test_fb_xrgb8888_to_argb1555(struct kunit 
*test)
        drm_fb_xrgb8888_to_argb1555(&dst, dst_pitch, &src, &fb, &params->clip);
        buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_ARGB1555, &src, 
&fb, &params->clip);
+
+       buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_rgba5551(struct kunit *test)
@@ -745,6 +781,18 @@ static void drm_test_fb_xrgb8888_to_rgba5551(struct kunit 
*test)
        drm_fb_xrgb8888_to_rgba5551(&dst, dst_pitch, &src, &fb, &params->clip);
        buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_RGBA5551, &src, 
&fb, &params->clip);
+
+       buf = le16buf_to_cpu(test, (__force const __le16 *)buf, dst_size / 
sizeof(__le16));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_rgb888(struct kunit *test)
@@ -782,6 +830,16 @@ static void drm_test_fb_xrgb8888_to_rgb888(struct kunit 
*test)
 
        drm_fb_xrgb8888_to_rgb888(&dst, dst_pitch, &src, &fb, &params->clip);
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_RGB888, &src, 
&fb, &params->clip);
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_argb8888(struct kunit *test)
@@ -816,6 +874,18 @@ static void drm_test_fb_xrgb8888_to_argb8888(struct kunit 
*test)
        drm_fb_xrgb8888_to_argb8888(&dst, dst_pitch, &src, &fb, &params->clip);
        buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_ARGB8888, &src, 
&fb, &params->clip);
+
+       buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_xrgb2101010(struct kunit *test)
@@ -850,6 +920,17 @@ static void drm_test_fb_xrgb8888_to_xrgb2101010(struct 
kunit *test)
        drm_fb_xrgb8888_to_xrgb2101010(&dst, dst_pitch, &src, &fb, 
&params->clip);
        buf = le32buf_to_cpu(test, buf, dst_size / sizeof(u32));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_XRGB2101010, 
&src, &fb,
+                                 &params->clip);
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_argb2101010(struct kunit *test)
@@ -884,6 +965,19 @@ static void drm_test_fb_xrgb8888_to_argb2101010(struct 
kunit *test)
        drm_fb_xrgb8888_to_argb2101010(&dst, dst_pitch, &src, &fb, 
&params->clip);
        buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result = 0;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_ARGB2101010, 
&src, &fb,
+                                 &params->clip);
+
+       buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 static void drm_test_fb_xrgb8888_to_mono(struct kunit *test)
@@ -951,6 +1045,41 @@ static void drm_test_fb_swab(struct kunit *test)
        drm_fb_swab(&dst, dst_pitch, &src, &fb, &params->clip, false);
        buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
        KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr; /* restore original value of buf */
+       memset(buf, 0, dst_size);
+
+       int blit_result;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_XRGB8888 | 
DRM_FORMAT_BIG_ENDIAN,
+                                 &src, &fb, &params->clip);
+       buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr;
+       memset(buf, 0, dst_size);
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_BGRX8888, &src, 
&fb, &params->clip);
+       buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
+
+       buf = dst.vaddr;
+       memset(buf, 0, dst_size);
+
+       struct drm_format_info mock_format = *fb.format;
+
+       mock_format.format |= DRM_FORMAT_BIG_ENDIAN;
+       fb.format = &mock_format;
+
+       blit_result = drm_fb_blit(&dst, dst_pitch, DRM_FORMAT_XRGB8888, &src, 
&fb, &params->clip);
+       buf = le32buf_to_cpu(test, (__force const __le32 *)buf, dst_size / 
sizeof(u32));
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
+       KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size);
 }
 
 struct clip_offset_case {
@@ -1538,6 +1667,20 @@ static void drm_test_fb_memcpy(struct kunit *test)
 
        drm_fb_memcpy(dst, dst_pitches, src, &fb, &params->clip);
 
+       for (size_t i = 0; i < fb.format->num_planes; i++) {
+               expected[i] = cpubuf_to_le32(test, params->expected[i], 
TEST_BUF_SIZE);
+               KUNIT_EXPECT_MEMEQ_MSG(test, buf[i], expected[i], dst_size[i],
+                                      "Failed expectation on plane %zu", i);
+
+               memset(buf[i], 0, dst_size[i]);
+       }
+
+
+       int blit_result;
+
+       blit_result = drm_fb_blit(dst, dst_pitches, params->format, src, &fb, 
&params->clip);
+
+       KUNIT_EXPECT_FALSE(test, blit_result);
        for (size_t i = 0; i < fb.format->num_planes; i++) {
                expected[i] = cpubuf_to_le32(test, params->expected[i], 
TEST_BUF_SIZE);
                KUNIT_EXPECT_MEMEQ_MSG(test, buf[i], expected[i], dst_size[i],

-- 
2.41.0

[PATCH v3 1/2] drm/tests: Add calls to drm_fb_blit() on supported format conversion tests

Reply via email to