[igt-dev] [PATCH i-g-t v3 3/7] tests/kms_color: MPO + pipe color test for gamma.
Ananya Sharma
ananya.sharma at intel.com
Fri Sep 16 12:58:15 UTC 2022
MPO + pipe color test for gamma transformation.
Signed-off-by: Ananya Sharma <ananya.sharma at intel.com>
---
tests/kms_color.c | 109 ++++++++++++++++++++++++++++++++++------------
1 file changed, 80 insertions(+), 29 deletions(-)
diff --git a/tests/kms_color.c b/tests/kms_color.c
index 998d67d0..22679e89 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -167,6 +167,7 @@ static bool test_pipe_gamma(data_t *data,
bool multiplane)
{
igt_output_t *output = data->output;
+ igt_plane_t *overlay;
igt_display_t *display = &data->display;
gamma_lut_t *gamma_full;
color_t red_green_blue[] = {
@@ -174,12 +175,23 @@ static bool test_pipe_gamma(data_t *data,
{ 0.0, 1.0, 0.0 },
{ 0.0, 0.0, 1.0 }
};
+ color_t blue_red_green[] = {
+ { 0.0, 1.0, 0.0 },
+ { 0.0, 0.0, 1.0 },
+ { 1.0, 0.0, 0.0 }
+ };
+
drmModeModeInfo *mode = data->mode;
- struct igt_fb fb_modeset, fb;
+ struct igt_fb fb0, fb1;
igt_crc_t crc_fullgamma, crc_fullcolors;
- int fb_id, fb_modeset_id;
+ int fb_id0, fb_id1;
+ int primary_x, primary_y, primary_h, primary_w;
+ int overlay_x, overlay_y, overlay_h, overlay_w;
bool ret;
+ if (multiplane)
+ overlay = igt_pipe_get_plane_type(primary->pipe, DRM_PLANE_TYPE_OVERLAY);
+
igt_require(igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_GAMMA_LUT));
gamma_full = generate_table_max(data->gamma_lut_size);
@@ -187,33 +199,57 @@ static bool test_pipe_gamma(data_t *data,
igt_output_set_pipe(output, primary->pipe->pipe);
igt_output_override_mode(output, mode);
+ primary_w = mode->hdisplay;
+ primary_h = multiplane ? (mode->vdisplay / 2) : mode->vdisplay;
+ overlay_w = mode->hdisplay;
+ overlay_h = primary_h + (mode->vdisplay % 2);
+ primary_x = 0;
+ primary_y = 0;
+ overlay_x = 0;
+ overlay_y = primary_h;
+
/* Create a framebuffer at the size of the output. */
- fb_id = igt_create_fb(data->drm_fd,
- mode->hdisplay,
- mode->vdisplay,
- data->drm_format,
- DRM_FORMAT_MOD_LINEAR,
- &fb);
- igt_assert(fb_id);
+ fb_id0 = igt_create_fb(data->drm_fd,
+ primary_w,
+ primary_h,
+ data->drm_format,
+ DRM_FORMAT_MOD_LINEAR,
+ &fb0);
+ igt_assert(fb_id0);
- fb_modeset_id = igt_create_fb(data->drm_fd,
- mode->hdisplay,
- mode->vdisplay,
- data->drm_format,
- DRM_FORMAT_MOD_LINEAR,
- &fb_modeset);
- igt_assert(fb_modeset_id);
+ igt_plane_set_fb(primary, &fb0);
+ igt_plane_set_position(primary, primary_x, primary_y);
+
+ if (multiplane) {
+ fb_id1 = igt_create_fb(data->drm_fd,
+ overlay_w,
+ overlay_h,
+ data->drm_format,
+ DRM_FORMAT_MOD_LINEAR,
+ &fb1);
+ igt_assert(fb_id1);
+
+ igt_plane_set_fb(overlay, &fb1);
+ igt_plane_set_position(overlay, overlay_x, overlay_y);
+ }
- igt_plane_set_fb(primary, &fb_modeset);
disable_ctm(primary->pipe);
disable_degamma(primary->pipe);
- set_gamma(data, primary->pipe, gamma_full);
- igt_display_commit(&data->display);
+ disable_gamma(primary->pipe);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_ATOMIC : COMMIT_LEGACY);
/* Draw solid colors with no gamma transformation. */
- paint_rectangles(data, mode->vdisplay, mode->hdisplay, 0, 0, red_green_blue, &fb);
- igt_plane_set_fb(primary, &fb);
- igt_display_commit(&data->display);
+ paint_rectangles(data, primary_h, primary_w, primary_x, primary_y, red_green_blue, &fb0);
+ igt_plane_set_fb(primary, &fb0);
+ igt_plane_set_position(primary, primary_x, primary_y);
+
+ if (multiplane) {
+ paint_rectangles(data, overlay_h, overlay_w, 0, 0, blue_red_green, &fb1);
+ igt_plane_set_fb(overlay, &fb1);
+ igt_plane_set_position(overlay, overlay_x, overlay_y);
+ }
+
+ igt_display_commit2(&data->display, multiplane ? COMMIT_ATOMIC : COMMIT_LEGACY);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
@@ -222,9 +258,18 @@ static bool test_pipe_gamma(data_t *data,
* Draw a gradient with gamma LUT to remap all values
* to max red/green/blue.
*/
- paint_gradient_rectangles(data, mode->vdisplay, mode->hdisplay, 0, 0, red_green_blue, &fb);
- igt_plane_set_fb(primary, &fb);
- igt_display_commit(&data->display);
+ paint_gradient_rectangles(data, primary_h, primary_w, primary_x, primary_y, red_green_blue, &fb0);
+ igt_plane_set_fb(primary, &fb0);
+ igt_plane_set_position(primary, primary_x, primary_y);
+
+ if (multiplane) {
+ paint_gradient_rectangles(data, overlay_h, overlay_w, 0, 0, blue_red_green, &fb1);
+ igt_plane_set_fb(overlay, &fb1);
+ igt_plane_set_position(overlay, overlay_x, overlay_y);
+ }
+
+ set_gamma(data, primary->pipe, gamma_full);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_ATOMIC : COMMIT_LEGACY);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
@@ -233,14 +278,17 @@ static bool test_pipe_gamma(data_t *data,
* Verify that the CRC of the software computed output is
* equal to the CRC of the gamma LUT transformation output.
*/
- ret = !igt_skip_crc_compare || igt_check_crc_equal(&crc_fullgamma, &crc_fullcolors);
+ ret = igt_skip_crc_compare || igt_check_crc_equal(&crc_fullgamma, &crc_fullcolors);
disable_gamma(primary->pipe);
igt_plane_set_fb(primary, NULL);
+ if (multiplane)
+ igt_plane_set_fb(overlay, NULL);
igt_output_set_pipe(output, PIPE_NONE);
- igt_display_commit(&data->display);
- igt_remove_fb(data->drm_fd, &fb);
- igt_remove_fb(data->drm_fd, &fb_modeset);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_ATOMIC : COMMIT_LEGACY);
+ igt_remove_fb(data->drm_fd, &fb0);
+ if (multiplane)
+ igt_remove_fb(data->drm_fd, &fb1);
free_lut(gamma_full);
@@ -973,6 +1021,9 @@ run_tests_for_pipe(data_t *data)
{ "gamma", test_pipe_gamma, false,
"Verify that gamma LUT transformation works correctly" },
+ { "gamma-multiplane", test_pipe_gamma, true,
+ "Verify that gamma LUT transformation works correctly" },
+
{ "legacy-gamma", test_pipe_legacy_gamma, false,
"Verify that legacy gamma LUT transformation works correctly" },
--
2.25.1
More information about the igt-dev
mailing list