@@ -32,7 +32,6 @@ static void test_pipe_degamma(data_t *data,
igt_output_t *output;
igt_display_t *display = &data->display;
gamma_lut_t *degamma_linear, *degamma_full;
- gamma_lut_t *gamma_linear;
color_t red_green_blue[] = {
{ 1.0, 0.0, 0.0 },
{ 0.0, 1.0, 0.0 },
@@ -45,8 +44,6 @@ static void test_pipe_degamma(data_t *data,
degamma_linear = generate_table(data->degamma_lut_size, 1.0);
degamma_full = generate_table_max(data->degamma_lut_size);
- gamma_linear = generate_table(data->gamma_lut_size, 1.0);
-
for_each_valid_output_on_pipe(&data->display, primary->pipe->pipe, output) {
drmModeModeInfo *mode;
struct igt_fb fb_modeset, fb;
@@ -75,11 +72,11 @@ static void test_pipe_degamma(data_t *data,
igt_plane_set_fb(primary, &fb_modeset);
disable_ctm(primary->pipe);
- disable_degamma(primary->pipe);
- set_gamma(data, primary->pipe, gamma_linear);
+ disable_gamma(primary->pipe);
+ set_degamma(data, primary->pipe, degamma_linear);
igt_display_commit(&data->display);
- /* Draw solid colors with no degamma transformation. */
+ /* 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);
@@ -103,15 +100,16 @@ static void test_pipe_degamma(data_t *data,
*/
igt_assert_crc_equal(&crc_fullgamma, &crc_fullcolors);
+ disable_degamma(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);
}
free_lut(degamma_linear);
free_lut(degamma_full);
- free_lut(gamma_linear);
}
/*
@@ -189,8 +187,10 @@ static void test_pipe_gamma(data_t *data,
*/
igt_assert_crc_equal(&crc_fullgamma, &crc_fullcolors);
+ disable_gamma(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);
}
This patch disables gamma in degamma subtest which is missing. It compares CRC between (linear degamma + solid colors) and (max degamma + gradient colors). Patch also cleans up degamma before exiting degamma test and cleans up gamma before exiting gamma test. v2 - Addressed review comments from Bhanuprakash Modem Changed full degamma for reference CRC to linear degamma Added clean up of degamma end of degamma test. v3 - Addressed review comments from Bhanuprakash Modem Fixed comments Change-Id: Ibdb91b603e2e4024d170727d24c6a5425441e2e1 Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com> --- tests/kms_color.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)