[PATCH V8 20/36] lib/igt_fb: Allow any non-planar format for igt_copy_fb
Alex Hung
alex.hung at amd.com
Wed Apr 30 01:34:38 UTC 2025
From: Harry Wentland <harry.wentland at amd.com>
The function is able to handle any non-planar format. It's been
tested for XRGB8888 and XRGB2101010 so far but should work
for a wider range of formats.
Signed-off-by: Harry Wentland <harry.wentland at amd.com>
---
lib/igt_fb.c | 4 --
tests/kms_colorop.c | 139 +++++++++++++++++++++++++-------------------
2 files changed, 78 insertions(+), 65 deletions(-)
diff --git a/lib/igt_fb.c b/lib/igt_fb.c
index f2c09de50..47ad33512 100644
--- a/lib/igt_fb.c
+++ b/lib/igt_fb.c
@@ -2182,10 +2182,6 @@ unsigned int igt_copy_fb(int fd, struct igt_fb *src, struct igt_fb *fb)
if (src->num_planes != 1)
return -EINVAL;
- /* TODO expand for other formats */
- if (src->drm_format != DRM_FORMAT_XRGB8888)
- return -EINVAL;
-
fb_id = igt_create_fb(fd, src->width, src->height, src->drm_format,
src->modifier, fb);
diff --git a/tests/kms_colorop.c b/tests/kms_colorop.c
index cc260618e..b7d112082 100644
--- a/tests/kms_colorop.c
+++ b/tests/kms_colorop.c
@@ -389,52 +389,20 @@ static void apply_transforms(kms_colorop_t *colorops[], igt_fb_t *sw_transform_f
}
static void colorop_plane_test(igt_display_t *display,
+ igt_output_t *output,
+ igt_plane_t *plane,
+ igt_fb_t *input_fb,
+ igt_fb_t *output_fb,
__u32 fourcc_in,
__u32 fourcc_out,
kms_colorop_t *colorops[])
{
igt_colorop_t *color_pipeline = NULL;
- igt_output_t *output;
- igt_plane_t *plane;
- igt_fb_t input_fb;
igt_fb_t sw_transform_fb;
- igt_fb_t output_fb;
- drmModeModeInfo mode;
- unsigned int fb_id;
igt_crc_t input_crc, output_crc;
+ int res;
- output = kms_writeback_get_output(display, fourcc_in, fourcc_out);
- igt_require(output);
-
- if (output->use_override_mode)
- memcpy(&mode, &output->override_mode, sizeof(mode));
- else
- memcpy(&mode, &output->config.default_mode, sizeof(mode));
-
- /* create input fb */
- plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
- igt_assert(plane);
-
- fb_id = igt_create_color_pattern_fb(display->drm_fd,
- mode.hdisplay, mode.vdisplay,
- fourcc_in, DRM_FORMAT_MOD_LINEAR,
- 0.2, 0.2, 0.2, &input_fb);
- igt_assert(fb_id >= 0);
- igt_plane_set_fb(plane, &input_fb);
-#if DUMP_FBS
- igt_dump_fb(display, &input_fb, ".", "input");
-#endif
-
- /* create output fb */
- fb_id = igt_create_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
- fourcc_in,
- igt_fb_mod_to_tiling(0),
- &output_fb);
- igt_require(fb_id > 0);
-
- igt_fb_get_fnv1a_crc(&input_fb, &input_crc);
-
- igt_require(igt_plane_has_prop(plane, IGT_PLANE_COLOR_PIPELINE));
+ igt_fb_get_fnv1a_crc(input_fb, &input_crc);
/* reset color pipeline*/
@@ -442,8 +410,8 @@ static void colorop_plane_test(igt_display_t *display,
set_color_pipeline_bypass(plane);
/* Commit */
- igt_plane_set_fb(plane, &input_fb);
- igt_output_set_writeback_fb(output, &output_fb);
+ igt_plane_set_fb(plane, input_fb);
+ igt_output_set_writeback_fb(output, output_fb);
igt_display_commit_atomic(output->display,
DRM_MODE_ATOMIC_ALLOW_MODESET,
@@ -451,14 +419,15 @@ static void colorop_plane_test(igt_display_t *display,
get_and_wait_out_fence(output);
/* Compare input and output buffers. They should be equal here. */
- igt_fb_get_fnv1a_crc(&output_fb, &output_crc);
+ igt_fb_get_fnv1a_crc(output_fb, &output_crc);
igt_assert_crc_equal(&input_crc, &output_crc);
/* create sw transformed buffer */
+ res = igt_copy_fb(display->drm_fd, input_fb, &sw_transform_fb);
+ igt_assert_lte(0, res);
- igt_copy_fb(display->drm_fd, &input_fb, &sw_transform_fb);
- igt_assert(igt_cmp_fb_pixels(&input_fb, &sw_transform_fb, 0, 0));
+ igt_assert(igt_cmp_fb_pixels(input_fb, &sw_transform_fb, 0, 0));
apply_transforms(colorops, &sw_transform_fb);
#if DUMP_FBS
@@ -479,7 +448,7 @@ static void colorop_plane_test(igt_display_t *display,
set_color_pipeline(display, plane, colorops, color_pipeline);
}
- igt_output_set_writeback_fb(output, &output_fb);
+ igt_output_set_writeback_fb(output, output_fb);
/* commit COLOR_PIPELINE */
igt_display_commit_atomic(display,
@@ -487,28 +456,24 @@ static void colorop_plane_test(igt_display_t *display,
NULL);
get_and_wait_out_fence(output);
#if DUMP_FBS
- igt_dump_fb(display, &output_fb, ".", "output");
+ igt_dump_fb(display, output_fb, ".", "output");
#endif
/* compare sw transformed and KMS transformed FBs */
- igt_assert(compare_with_bracket(&sw_transform_fb, &output_fb));
+ igt_assert(compare_with_bracket(&sw_transform_fb, output_fb));
/* reset color pipeline*/
set_color_pipeline_bypass(plane);
/* Commit */
- igt_plane_set_fb(plane, &input_fb);
- igt_output_set_writeback_fb(output, &output_fb);
+ igt_plane_set_fb(plane, input_fb);
+ igt_output_set_writeback_fb(output, output_fb);
igt_display_commit_atomic(output->display,
DRM_MODE_ATOMIC_ALLOW_MODESET,
NULL);
get_and_wait_out_fence(output);
- /* cleanup */
- detach_crtc(display, output);
- igt_remove_fb(display->drm_fd, &input_fb);
- igt_remove_fb(display->drm_fd, &output_fb);
}
igt_main
@@ -560,17 +525,69 @@ igt_main
igt_display_require(&display, display.drm_fd);
igt_require(display.is_atomic);
-
}
for (j = 0; j < ARRAY_SIZE(formats); j++) {
- for (i = 0; i < sizeof(tests) / sizeof (tests[0]); i++) {
- igt_describe("Bla bla bla");
- igt_subtest_f("plane-%s-%s", formats[j].name, tests[i].name)
- colorop_plane_test(&display,
- formats[j].fourcc_in,
- formats[j].fourcc_out,
- tests[i].colorops);
+ igt_output_t *output;
+ igt_plane_t *plane;
+ igt_fb_t input_fb, output_fb;
+ unsigned int fb_id;
+ drmModeModeInfo mode;
+
+ igt_subtest_group {
+ igt_fixture {
+ output = kms_writeback_get_output(&display,
+ formats[j].fourcc_in,
+ formats[j].fourcc_out);
+ igt_require(output);
+
+ if (output->use_override_mode)
+ memcpy(&mode, &output->override_mode, sizeof(mode));
+ else
+ memcpy(&mode, &output->config.default_mode, sizeof(mode));
+
+ /* create input fb */
+ plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
+ igt_assert(plane);
+ igt_require(igt_plane_has_prop(plane, IGT_PLANE_COLOR_PIPELINE));
+
+ fb_id = igt_create_color_pattern_fb(display.drm_fd,
+ mode.hdisplay, mode.vdisplay,
+ formats[j].fourcc_in, DRM_FORMAT_MOD_LINEAR,
+ 0.2, 0.2, 0.2, &input_fb);
+ igt_assert(fb_id >= 0);
+ igt_plane_set_fb(plane, &input_fb);
+#if DUMP_FBS
+ igt_dump_fb(&display, &input_fb, ".", "input");
+#endif
+
+ /* create output fb */
+ fb_id = igt_create_fb(display.drm_fd, mode.hdisplay, mode.vdisplay,
+ formats[j].fourcc_in,
+ igt_fb_mod_to_tiling(0),
+ &output_fb);
+ igt_require(fb_id > 0);
+ }
+
+ for (i = 0; i < sizeof(tests) / sizeof (tests[0]); i++) {
+ igt_describe("Bla bla bla");
+ igt_subtest_f("plane-%s-%s", formats[j].name, tests[i].name)
+ colorop_plane_test(&display,
+ output,
+ plane,
+ &input_fb,
+ &output_fb,
+ formats[j].fourcc_in,
+ formats[j].fourcc_out,
+ tests[i].colorops);
+ }
+
+ igt_fixture {
+ detach_crtc(&display, output);
+ igt_remove_fb(display.drm_fd, &input_fb);
+ igt_remove_fb(display.drm_fd, &output_fb);
+
+ }
}
}
igt_describe("Tests getting and setting COLOR_PIPELINE property on plane");
@@ -583,7 +600,7 @@ igt_main
}
#endif
igt_fixture {
-
igt_display_fini(&display);
+ drm_close_driver(display.drm_fd);
}
}
--
2.43.0
More information about the igt-dev
mailing list