[i-g-t V2] tests/kms_color: MPO + pipe color test.
Bhanuprakash Modem
bhanuprakash.modem at intel.com
Mon Sep 12 14:28:20 UTC 2022
From: Ananya Sharma <ananya.sharma at intel.com>
MPO + pipe color test for gamma, degamma, ctm transformation.
V2:
- Optimize to re-use existing logic
Signed-off-by: Ananya Sharma <ananya.sharma at intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
tests/kms_color.c | 403 ++++++++++++++++++++++++++++++++--------------
1 file changed, 281 insertions(+), 122 deletions(-)
diff --git a/tests/kms_color.c b/tests/kms_color.c
index c202547e..cf947d0e 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -27,58 +27,93 @@
IGT_TEST_DESCRIPTION("Test Color Features at Pipe level");
static bool test_pipe_degamma(data_t *data,
- igt_plane_t *primary)
+ igt_plane_t *primary, bool multiplane)
{
igt_output_t *output = data->output;
+ igt_plane_t *overlay;
igt_display_t *display = &data->display;
- gamma_lut_t *degamma_linear, *degamma_full;
+ gamma_lut_t *degamma_full;
color_t red_green_blue[] = {
{ 1.0, 0.0, 0.0 },
{ 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_DEGAMMA_LUT));
igt_require(igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_GAMMA_LUT));
- degamma_linear = generate_table(data->degamma_lut_size, 1.0);
degamma_full = generate_table_max(data->degamma_lut_size);
igt_output_set_pipe(output, primary->pipe->pipe);
igt_output_override_mode(output, mode);
- /* 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);
+ primary_w = mode->hdisplay;
+ primary_h = multiplane ? (mode->vdisplay / 2) : mode->vdisplay;
+ overlay_w = mode->hdisplay;
+ overlay_h = primary_h + (mode->vdisplay % 2);
- 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);
+ primary_x = 0;
+ primary_y = 0;
+ overlay_x = 0;
+ overlay_y = primary_h + 1;
+
+ /* Create a framebuffer at the size of the output. */
+ fb_id0 = igt_create_fb(data->drm_fd,
+ primary_w,
+ primary_h,
+ data->drm_format,
+ DRM_FORMAT_MOD_LINEAR,
+ &fb0);
+ igt_assert(fb_id0);
+
+ 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_gamma(primary->pipe);
- set_degamma(data, primary->pipe, degamma_linear);
- igt_display_commit(&data->display);
+ disable_degamma(primary->pipe);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_LEGACY : COMMIT_ATOMIC);
- /* Draw solid colors with linear degamma transformation. */
- paint_rectangles(data, mode, red_green_blue, &fb);
- igt_plane_set_fb(primary, &fb);
- igt_display_commit(&data->display);
+ /* Draw solid colors with no degamma transformation. */
+ paint_rectangles(data, mode, red_green_blue, &fb0);
+ igt_plane_set_fb(primary, &fb0);
+ igt_plane_set_position(primary, primary_x, primary_y);
+
+ if (multiplane) {
+ paint_rectangles(data, mode, 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_LEGACY : COMMIT_ATOMIC);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
@@ -87,10 +122,18 @@ static bool test_pipe_degamma(data_t *data,
* Draw a gradient with degamma LUT to remap all
* values to max red/green/blue.
*/
- paint_gradient_rectangles(data, mode, red_green_blue, &fb);
- igt_plane_set_fb(primary, &fb);
+ paint_gradient_rectangles(data, mode, 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, mode, blue_red_green, &fb1);
+ igt_plane_set_fb(overlay, &fb1);
+ igt_plane_set_position(overlay, overlay_x, overlay_y);
+ }
+
set_degamma(data, primary->pipe, degamma_full);
- igt_display_commit(&data->display);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_LEGACY : COMMIT_ATOMIC);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
@@ -99,16 +142,17 @@ static bool test_pipe_degamma(data_t *data,
* Verify that the CRC of the software computed output is
* equal to the CRC of the degamma 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_degamma(primary->pipe);
igt_plane_set_fb(primary, NULL);
+ 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_LEGACY : COMMIT_ATOMIC);
+
+ igt_remove_fb(data->drm_fd, &fb0);
+ igt_remove_fb(data->drm_fd, &fb1);
- free_lut(degamma_linear);
free_lut(degamma_full);
return ret;
@@ -119,9 +163,10 @@ static bool test_pipe_degamma(data_t *data,
* LUT and verify we have the same CRC as drawing solid color rectangles.
*/
static bool test_pipe_gamma(data_t *data,
- igt_plane_t *primary)
+ igt_plane_t *primary, 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[] = {
@@ -129,12 +174,22 @@ 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);
@@ -142,33 +197,57 @@ static bool test_pipe_gamma(data_t *data,
igt_output_set_pipe(output, primary->pipe->pipe);
igt_output_override_mode(output, mode);
- /* 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);
+ primary_w = mode->hdisplay;
+ primary_h = multiplane ? (mode->vdisplay / 2) : mode->vdisplay;
+ overlay_w = mode->hdisplay;
+ overlay_h = primary_h + (mode->vdisplay % 2);
- 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);
+ primary_x = 0;
+ primary_y = 0;
+ overlay_x = 0;
+ overlay_y = primary_h + 1;
+
+ /* Create a framebuffer at the size of the output. */
+ fb_id0 = igt_create_fb(data->drm_fd,
+ primary_w,
+ primary_h,
+ data->drm_format,
+ DRM_FORMAT_MOD_LINEAR,
+ &fb0);
+ igt_assert(fb_id0);
+
+ 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_LEGACY : COMMIT_ATOMIC);
/* Draw solid colors with no gamma transformation. */
- paint_rectangles(data, mode, red_green_blue, &fb);
- igt_plane_set_fb(primary, &fb);
- igt_display_commit(&data->display);
+ paint_rectangles(data, mode, red_green_blue, &fb0);
+ igt_plane_set_fb(primary, &fb0);
+ igt_plane_set_position(primary, primary_x, primary_y);
+
+ if (multiplane) {
+ paint_rectangles(data, mode, blue_red_green, &fb1);
+ igt_plane_set_fb(overlay, &fb0);
+ igt_plane_set_position(overlay, overlay_x, overlay_y);
+ }
+ igt_display_commit2(&data->display, multiplane ? COMMIT_LEGACY : COMMIT_ATOMIC);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
@@ -177,9 +256,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, red_green_blue, &fb);
- igt_plane_set_fb(primary, &fb);
- igt_display_commit(&data->display);
+ paint_gradient_rectangles(data, mode, 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, mode, 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_LEGACY : COMMIT_ATOMIC);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
@@ -188,14 +276,16 @@ 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);
+ 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_LEGACY : COMMIT_ATOMIC);
+
+ igt_remove_fb(data->drm_fd, &fb0);
+ igt_remove_fb(data->drm_fd, &fb1);
free_lut(gamma_full);
@@ -208,7 +298,7 @@ static bool test_pipe_gamma(data_t *data,
* with linear legacy gamma LUT.
*/
static bool test_pipe_legacy_gamma(data_t *data,
- igt_plane_t *primary)
+ igt_plane_t *primary, bool multiplane)
{
igt_output_t *output = data->output;
igt_display_t *display = &data->display;
@@ -317,7 +407,7 @@ static bool test_pipe_legacy_gamma(data_t *data,
* through the GAMMA_LUT property.
*/
static bool test_pipe_legacy_gamma_reset(data_t *data,
- igt_plane_t *primary)
+ igt_plane_t *primary, bool multiplane)
{
const double ctm_identity[] = {
1.0, 0.0, 0.0,
@@ -452,6 +542,7 @@ end:
*/
static bool test_pipe_ctm(data_t *data,
igt_plane_t *primary,
+ bool multiplane,
color_t *before,
color_t *after,
double *ctm_matrix)
@@ -461,14 +552,20 @@ static bool test_pipe_ctm(data_t *data,
0.0, 1.0, 0.0,
0.0, 0.0, 1.0
};
+ igt_plane_t *overlay;
gamma_lut_t *degamma_linear, *gamma_linear;
igt_output_t *output = data->output;
bool ret = true;
igt_display_t *display = &data->display;
drmModeModeInfo *mode = data->mode;
- struct igt_fb fb_modeset, fb;
+ struct igt_fb fb0, fb1;
igt_crc_t crc_software, crc_hardware;
- 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;
+
+ 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_CTM));
@@ -478,23 +575,40 @@ static bool test_pipe_ctm(data_t *data,
igt_output_set_pipe(output, primary->pipe->pipe);
igt_output_override_mode(output, mode);
- /* 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);
+ primary_w = mode->hdisplay;
+ primary_h = multiplane ? (mode->vdisplay / 2) : mode->vdisplay;
+ overlay_w = mode->hdisplay;
+ overlay_h = primary_h + (mode->vdisplay % 2);
- 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, &fb_modeset);
+ primary_x = 0;
+ primary_y = 0;
+ overlay_x = 0;
+ overlay_y = primary_h + 1;
+
+ /* Create a framebuffer at the size of the output. */
+ fb_id0 = igt_create_fb(data->drm_fd,
+ primary_w,
+ primary_h,
+ data->drm_format,
+ DRM_FORMAT_MOD_LINEAR,
+ &fb0);
+ igt_assert(fb_id0);
+
+ 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);
+ }
/*
* Don't program LUT's for max CTM cases, as limitation of
@@ -509,23 +623,38 @@ static bool test_pipe_ctm(data_t *data,
disable_degamma(primary->pipe);
disable_gamma(primary->pipe);
}
-
disable_ctm(primary->pipe);
- igt_display_commit(&data->display);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_LEGACY : COMMIT_ATOMIC);
+
+ paint_rectangles(data, mode, after, &fb0);
+ igt_plane_set_fb(primary, &fb0);
+ igt_plane_set_position(primary, primary_x, primary_y);
+
+ if (multiplane) {
+ paint_rectangles(data, mode, after, &fb1);
+ igt_plane_set_fb(overlay, &fb1);
+ igt_plane_set_position(overlay, overlay_x, overlay_y);
+ }
- paint_rectangles(data, mode, after, &fb);
- igt_plane_set_fb(primary, &fb);
set_ctm(primary->pipe, ctm_identity);
- igt_display_commit(&data->display);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_LEGACY : COMMIT_ATOMIC);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_software);
/* With CTM transformation. */
- paint_rectangles(data, mode, before, &fb);
- igt_plane_set_fb(primary, &fb);
+ paint_rectangles(data, mode, before, &fb0);
+ igt_plane_set_fb(primary, &fb0);
+ igt_plane_set_position(primary, primary_x, primary_y);
+
+ if (multiplane) {
+ paint_rectangles(data, mode, before, &fb1);
+ igt_plane_set_fb(overlay, &fb1);
+ igt_plane_set_position(overlay, overlay_x, overlay_y);
+ }
+
set_ctm(primary->pipe, ctm_matrix);
- igt_display_commit(&data->display);
+ igt_display_commit2(&data->display, multiplane ? COMMIT_LEGACY : COMMIT_ATOMIC);
igt_wait_for_vblank(data->drm_fd,
display->pipes[primary->pipe->pipe].crtc_offset);
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_hardware);
@@ -534,13 +663,17 @@ static bool test_pipe_ctm(data_t *data,
* Verify that the CRC of the software computed output is
* equal to the CRC of the CTM matrix transformation output.
*/
- ret &= !igt_skip_crc_compare || igt_check_crc_equal(&crc_software, &crc_hardware);
+ ret &= igt_skip_crc_compare || igt_check_crc_equal(&crc_software, &crc_hardware);
+ disable_degamma(primary->pipe);
+ disable_gamma(primary->pipe);
+ disable_ctm(primary->pipe);
igt_plane_set_fb(primary, 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_LEGACY : COMMIT_ATOMIC);
+
+ igt_remove_fb(data->drm_fd, &fb0);
+ igt_remove_fb(data->drm_fd, &fb1);
free_lut(degamma_linear);
free_lut(gamma_linear);
@@ -709,8 +842,8 @@ static void test_cleanup(data_t *data)
}
static void
-run_gamma_degamma_tests_for_pipe(data_t *data, enum pipe p,
- bool (*test_t)(data_t*, igt_plane_t*))
+run_gamma_degamma_tests_for_pipe(data_t *data, enum pipe p, bool multiplane,
+ bool (*test_t)(data_t*, igt_plane_t*, bool))
{
test_setup(data, p);
@@ -723,13 +856,13 @@ run_gamma_degamma_tests_for_pipe(data_t *data, enum pipe p,
data->mode = igt_output_get_mode(data->output);
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(p), data->output->name)
- igt_assert(test_t(data, data->primary));
+ igt_assert(test_t(data, data->primary, multiplane));
test_cleanup(data);
}
static void
-run_ctm_tests_for_pipe(data_t *data, enum pipe p,
+run_ctm_tests_for_pipe(data_t *data, enum pipe p, bool multiplane,
color_t *expected_colors,
double *ctm,
int iter)
@@ -757,8 +890,9 @@ run_ctm_tests_for_pipe(data_t *data, enum pipe p,
int i;
if (!iter)
- success = test_pipe_ctm(data, data->primary, red_green_blue,
- expected_colors, ctm);
+ success = test_pipe_ctm(data, data->primary, multiplane,
+ red_green_blue, expected_colors,
+ ctm);
/*
* We tests a few values around the expected result because
@@ -771,8 +905,8 @@ run_ctm_tests_for_pipe(data_t *data, enum pipe p,
expected_colors[1].g =
expected_colors[2].b =
0.5 + delta * (i - 2);
- if (test_pipe_ctm(data, data->primary, red_green_blue,
- expected_colors, ctm)) {
+ if (test_pipe_ctm(data, data->primary, multiplane,
+ red_green_blue, expected_colors, ctm)) {
success = true;
break;
}
@@ -838,7 +972,7 @@ run_deep_color_tests_for_pipe(data_t *data, enum pipe p)
igt_display_reset(&data->display);
igt_output_set_prop_value(output, IGT_CONNECTOR_MAX_BPC, 10);
- ret = test_pipe_gamma(data, data->primary);
+ ret = test_pipe_gamma(data, data->primary, false);
igt_output_set_prop_value(output, IGT_CONNECTOR_MAX_BPC, max_bpc);
igt_assert(ret);
@@ -848,7 +982,7 @@ run_deep_color_tests_for_pipe(data_t *data, enum pipe p)
igt_display_reset(&data->display);
igt_output_set_prop_value(output, IGT_CONNECTOR_MAX_BPC, 10);
- ret = test_pipe_degamma(data, data->primary);
+ ret = test_pipe_degamma(data, data->primary, false);
igt_output_set_prop_value(output, IGT_CONNECTOR_MAX_BPC, max_bpc);
igt_assert(ret);
@@ -858,7 +992,7 @@ run_deep_color_tests_for_pipe(data_t *data, enum pipe p)
igt_display_reset(&data->display);
igt_output_set_prop_value(output, IGT_CONNECTOR_MAX_BPC, 10);
- ret = test_pipe_ctm(data, data->primary,
+ ret = test_pipe_ctm(data, data->primary, false,
red_green_blue,
blue_green_blue, ctm);
@@ -913,29 +1047,46 @@ run_tests_for_pipe(data_t *data)
enum pipe pipe;
struct {
const char *name;
- bool (*test_t)(data_t*, igt_plane_t*);
+ bool (*test_t)(data_t*, igt_plane_t*, bool);
+ bool multiplane;
const char *desc;
} gamma_degamma_tests[] = {
- { "degamma", test_pipe_degamma,
+ { "degamma", test_pipe_degamma, false,
"Verify that degamma LUT transformation works correctly" },
- { "gamma", test_pipe_gamma,
+ { "degamma-multiplane", test_pipe_degamma, true,
+ "Verify that degamma LUT transformation works correctly with multiplane" },
+
+ { "gamma", test_pipe_gamma, false,
"Verify that gamma LUT transformation works correctly" },
- { "legacy-gamma", test_pipe_legacy_gamma,
+ { "gamma-multiplane", test_pipe_gamma, true,
+ "Verify that gamma LUT transformation works correctly with multiplane" },
+
+ { "legacy-gamma", test_pipe_legacy_gamma, false,
"Verify that legacy gamma LUT transformation works correctly" },
- { "legacy-gamma-reset", test_pipe_legacy_gamma_reset,
+ { "legacy-gamma-reset", test_pipe_legacy_gamma_reset, false,
"Verify that setting the legacy gamma LUT resets the gamma LUT set through GAMMA_LUT property" },
};
struct {
const char *name;
int iter;
+ bool multiplane;
color_t colors[3];
double ctm[9];
const char *desc;
} ctm_tests[] = {
- { "ctm-red-to-blue", 0,
+ { "ctm-red-to-blue", 0, false,
+ {{ 0.0, 0.0, 1.0 },
+ { 0.0, 1.0, 0.0 },
+ { 0.0, 0.0, 1.0 }},
+ { 0.0, 0.0, 0.0,
+ 0.0, 1.0, 0.0,
+ 1.0, 0.0, 1.0 },
+ "Check the color transformation from red to blue"
+ },
+ { "ctm-red-to-blue-multiplane", 0, true,
{{ 0.0, 0.0, 1.0 },
{ 0.0, 1.0, 0.0 },
{ 0.0, 0.0, 1.0 }},
@@ -944,7 +1095,7 @@ run_tests_for_pipe(data_t *data)
1.0, 0.0, 1.0 },
"Check the color transformation from red to blue"
},
- { "ctm-green-to-red", 0,
+ { "ctm-green-to-red", 0, false,
{{ 1.0, 0.0, 0.0 },
{ 1.0, 0.0, 0.0 },
{ 0.0, 0.0, 1.0 }},
@@ -953,7 +1104,7 @@ run_tests_for_pipe(data_t *data)
0.0, 0.0, 1.0 },
"Check the color transformation from green to red"
},
- { "ctm-blue-to-red", 0,
+ { "ctm-blue-to-red", 0, false,
{{ 1.0, 0.0, 0.0 },
{ 0.0, 1.0, 0.0 },
{ 1.0, 0.0, 0.0 }},
@@ -962,7 +1113,7 @@ run_tests_for_pipe(data_t *data)
0.0, 0.0, 0.0 },
"Check the color transformation from blue to red"
},
- { "ctm-max", 0,
+ { "ctm-max", 0, false,
{{ 1.0, 0.0, 0.0 },
{ 0.0, 1.0, 0.0 },
{ 0.0, 0.0, 1.0 }},
@@ -971,7 +1122,7 @@ run_tests_for_pipe(data_t *data)
0.0, 0.0, 100.0 },
"Check the color transformation for maximum transparency"
},
- { "ctm-negative", 0,
+ { "ctm-negative", 0, false,
{{ 0.0, 0.0, 0.0 },
{ 0.0, 0.0, 0.0 },
{ 0.0, 0.0, 0.0 }},
@@ -980,21 +1131,21 @@ run_tests_for_pipe(data_t *data)
0.0, 0.0, -1.0 },
"Check the color transformation for negative transparency"
},
- { "ctm-0-25", 5,
+ { "ctm-0-25", 5, false,
{{ 0.0, }, { 0.0, }, { 0.0, }},
{ 0.25, 0.0, 0.0,
0.0, 0.25, 0.0,
0.0, 0.0, 0.25 },
"Check the color transformation for 0.25 transparency"
},
- { "ctm-0-50", 5,
+ { "ctm-0-50", 5, false,
{{ 0.0, }, { 0.0, }, { 0.0, }},
{ 0.5, 0.0, 0.0,
0.0, 0.5, 0.0,
0.0, 0.0, 0.5 },
"Check the color transformation for 0.5 transparency"
},
- { "ctm-0-75", 7,
+ { "ctm-0-75", 7, false,
{{ 0.0, }, { 0.0, }, { 0.0, }},
{ 0.75, 0.0, 0.0,
0.0, 0.75, 0.0,
@@ -1007,8 +1158,12 @@ run_tests_for_pipe(data_t *data)
for (i = 0; i < ARRAY_SIZE(gamma_degamma_tests); i++) {
igt_describe_f("%s", gamma_degamma_tests[i].desc);
igt_subtest_with_dynamic_f("%s", gamma_degamma_tests[i].name) {
+ if (gamma_degamma_tests[i].multiplane && !data->display.is_atomic)
+ continue;
+
for_each_pipe(&data->display, pipe) {
run_gamma_degamma_tests_for_pipe(data, pipe,
+ gamma_degamma_tests[i].multiplane,
gamma_degamma_tests[i].test_t);
}
}
@@ -1017,8 +1172,12 @@ run_tests_for_pipe(data_t *data)
for (i = 0; i < ARRAY_SIZE(ctm_tests); i++) {
igt_describe_f("%s", ctm_tests[i].desc);
igt_subtest_with_dynamic_f("%s", ctm_tests[i].name) {
+ if (gamma_degamma_tests[i].multiplane && !data->display.is_atomic)
+ continue;
+
for_each_pipe(&data->display, pipe) {
run_ctm_tests_for_pipe(data, pipe,
+ ctm_tests[i].multiplane,
ctm_tests[i].colors,
ctm_tests[i].ctm,
ctm_tests[i].iter);
--
2.35.1
More information about the Intel-gfx-trybot
mailing list