| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220627161132.33256-3-jose.exposito89@gmail.com>
Date: Mon, 27 Jun 2022 18:11:30 +0200
From: José Expósito <jose.exposito89@...il.com>
To: javierm@...hat.com
Cc: davidgow@...gle.com, dlatypov@...gle.com, tzimmermann@...e.de,
mripard@...nel.org, daniel@...ll.ch, airlied@...ux.ie,
maarten.lankhorst@...ux.intel.com, jani.nikula@...ux.intel.com,
maira.canal@....br, isabbasso@...eup.net, magalilemes00@...il.com,
tales.aparecida@...il.com, dri-devel@...ts.freedesktop.org,
kunit-dev@...glegroups.com, linux-kernel@...r.kernel.org,
José Expósito <jose.exposito89@...il.com>
Subject: [PATCH 2/4] drm/format-helper: Transform tests to be agnostic of target format
In order to support multiple destination format conversions, store the
target format, conversion function, parameters and expected result in
its own structure.
Signed-off-by: José Expósito <jose.exposito89@...il.com>
---
.../gpu/drm/tests/drm_format_helper_test.c | 88 ++++++++++++++-----
1 file changed, 64 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c
index de8cf525109e..732d945e7f4e 100644
--- a/drivers/gpu/drm/tests/drm_format_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
@@ -16,34 +16,55 @@
#define TEST_BUF_SIZE 50
+struct convert_xrgb8888_result {
+ u32 dst_format;
+ void (*conv_func)(void *dst, unsigned int dst_pitch,
+ const void *src,
+ const struct drm_framebuffer *fb,
+ const struct drm_rect *clip);
+ unsigned int dst_pitch;
+ const u8 expected[4 * TEST_BUF_SIZE];
+};
+
struct convert_xrgb8888_case {
const char *name;
unsigned int pitch;
- unsigned int dst_pitch;
struct drm_rect clip;
const u32 xrgb8888[TEST_BUF_SIZE];
- const u8 expected[4 * TEST_BUF_SIZE];
+ struct convert_xrgb8888_result results[1];
};
static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
{
.name = "single_pixel_source_buffer",
.pitch = 1 * 4,
- .dst_pitch = 0,
.clip = DRM_RECT_INIT(0, 0, 1, 1),
.xrgb8888 = { 0x01FF0000 },
- .expected = { 0xE0 },
+ .results = {
+ {
+ .dst_format = DRM_FORMAT_RGB332,
+ .conv_func = drm_fb_xrgb8888_to_rgb332,
+ .dst_pitch = 0,
+ .expected = { 0xE0 },
+ },
+ },
},
{
.name = "single_pixel_clip_rectangle",
.pitch = 2 * 4,
- .dst_pitch = 0,
.clip = DRM_RECT_INIT(1, 1, 1, 1),
.xrgb8888 = {
0x00000000, 0x00000000,
0x00000000, 0x10FF0000,
},
- .expected = { 0xE0 },
+ .results = {
+ {
+ .dst_format = DRM_FORMAT_RGB332,
+ .conv_func = drm_fb_xrgb8888_to_rgb332,
+ .dst_pitch = 0,
+ .expected = { 0xE0 },
+ },
+ },
},
{
/* Well known colors: White, black, red, green, blue, magenta,
@@ -52,7 +73,6 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
*/
.name = "well_known_colors",
.pitch = 4 * 4,
- .dst_pitch = 0,
.clip = DRM_RECT_INIT(1, 1, 2, 4),
.xrgb8888 = {
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -61,28 +81,41 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = {
0x00000000, 0x550000FF, 0x66FF00FF, 0x00000000,
0x00000000, 0x77FFFF00, 0x8800FFFF, 0x00000000,
},
- .expected = {
- 0xFF, 0x00,
- 0xE0, 0x1C,
- 0x03, 0xE3,
- 0xFC, 0x1F,
+ .results = {
+ {
+ .dst_format = DRM_FORMAT_RGB332,
+ .conv_func = drm_fb_xrgb8888_to_rgb332,
+ .dst_pitch = 0,
+ .expected = {
+ 0xFF, 0x00,
+ 0xE0, 0x1C,
+ 0x03, 0xE3,
+ 0xFC, 0x1F,
+ },
+ },
},
},
{
/* Randomly picked colors. Full buffer within the clip area. */
.name = "destination_pitch",
.pitch = 3 * 4,
- .dst_pitch = 5,
.clip = DRM_RECT_INIT(0, 0, 3, 3),
.xrgb8888 = {
0xA10E449C, 0xB1114D05, 0xC1A80303,
0xD16C7073, 0xA20E449C, 0xB2114D05,
0xC2A80303, 0xD26C7073, 0xA30E449C,
},
- .expected = {
- 0x0A, 0x08, 0xA0, 0x00, 0x00,
- 0x6D, 0x0A, 0x08, 0x00, 0x00,
- 0xA0, 0x6D, 0x0A, 0x00, 0x00,
+ .results = {
+ {
+ .dst_format = DRM_FORMAT_RGB332,
+ .conv_func = drm_fb_xrgb8888_to_rgb332,
+ .dst_pitch = 5,
+ .expected = {
+ 0x0A, 0x08, 0xA0, 0x00, 0x00,
+ 0x6D, 0x0A, 0x08, 0x00, 0x00,
+ 0xA0, 0x6D, 0x0A, 0x00, 0x00,
+ },
+ },
},
},
};
@@ -123,24 +156,31 @@ KUNIT_ARRAY_PARAM(convert_xrgb8888, convert_xrgb8888_cases,
static void convert_xrgb8888_test(struct kunit *test)
{
const struct convert_xrgb8888_case *params = test->param_value;
+ const struct convert_xrgb8888_result *result;
size_t dst_size;
__u8 *dst = NULL;
+ int n;
struct drm_framebuffer fb = {
.format = drm_format_info(DRM_FORMAT_XRGB8888),
.pitches = { params->pitch, 0, 0 },
};
- dst_size = conversion_buf_size(DRM_FORMAT_RGB332, params->dst_pitch,
- ¶ms->clip);
- KUNIT_ASSERT_GT(test, dst_size, 0);
+ for (n = 0; n < ARRAY_SIZE(params->results); n++) {
+ result = ¶ms->results[n];
+
+ dst_size = conversion_buf_size(result->dst_format,
+ result->dst_pitch,
+ ¶ms->clip);
+ KUNIT_ASSERT_GT(test, dst_size, 0);
- dst = kunit_kzalloc(test, dst_size, GFP_KERNEL);
- KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dst);
+ dst = kunit_kzalloc(test, dst_size, GFP_KERNEL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dst);
- drm_fb_xrgb8888_to_rgb332(dst, params->dst_pitch, params->xrgb8888,
+ result->conv_func(dst, result->dst_pitch, params->xrgb8888,
&fb, ¶ms->clip);
- KUNIT_EXPECT_EQ(test, memcmp(dst, params->expected, dst_size), 0);
+ KUNIT_EXPECT_EQ(test, memcmp(dst, result->expected, dst_size), 0);
+ }
}
static struct kunit_case drm_format_helper_test_cases[] = {
--
2.25.1
Powered by blists - more mailing lists