From 2e1c944664669e33f56c0195fa91efa6451f8d78 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Tue, 2 Apr 2019 18:05:56 +0300 Subject: tests/kms_color: Split invalid_lut_sizes() into gamma vs. degamma versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Split the invalid-lut-sizes test into separate gamma and degamma tests. This way we can report SKIP for the thing we don't have. Also make the CTM invalid sizes test report a skip too. Signed-off-by: Ville Syrjälä Reviewed-by: Daniel Vetter --- tests/kms_color.c | 103 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 44 deletions(-) diff --git a/tests/kms_color.c b/tests/kms_color.c index f5bd49db..6fc74a33 100644 --- a/tests/kms_color.c +++ b/tests/kms_color.c @@ -1092,57 +1092,70 @@ pipe_set_property_blob(igt_pipe_t *pipe, enum igt_atomic_crtc_properties prop, v } static void -invalid_lut_sizes(data_t *data) +invalid_gamma_lut_sizes(data_t *data) { igt_display_t *display = &data->display; igt_pipe_t *pipe = &display->pipes[0]; - size_t degamma_lut_size = data->degamma_lut_size * sizeof(struct drm_color_lut); size_t gamma_lut_size = data->gamma_lut_size * sizeof(struct drm_color_lut); + struct drm_color_lut *gamma_lut; + + igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_GAMMA_LUT)); - struct drm_color_lut *degamma_lut = malloc(degamma_lut_size * 2); - struct drm_color_lut *gamma_lut = malloc(gamma_lut_size * 2); + gamma_lut = malloc(gamma_lut_size * 2); igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); - if (igt_pipe_obj_has_prop(pipe, IGT_CRTC_DEGAMMA_LUT)) { - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, - degamma_lut, 1), -EINVAL); - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, - degamma_lut, degamma_lut_size + 1), - -EINVAL); - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, - degamma_lut, degamma_lut_size - 1), - -EINVAL); - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, - degamma_lut, degamma_lut_size + sizeof(struct drm_color_lut)), - -EINVAL); - igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_DEGAMMA_LUT, pipe->crtc_id), - -EINVAL); - igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_DEGAMMA_LUT, 4096 * 4096), - -EINVAL); - } + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, + gamma_lut, 1), + -EINVAL); + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, + gamma_lut, gamma_lut_size + 1), + -EINVAL); + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, + gamma_lut, gamma_lut_size - 1), + -EINVAL); + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, + gamma_lut, gamma_lut_size + sizeof(struct drm_color_lut)), + -EINVAL); + igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_GAMMA_LUT, pipe->crtc_id), + -EINVAL); + igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_GAMMA_LUT, 4096 * 4096), + -EINVAL); - if (igt_pipe_obj_has_prop(pipe, IGT_CRTC_GAMMA_LUT)) { - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, - gamma_lut, 1), - -EINVAL); - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, - gamma_lut, gamma_lut_size + 1), - -EINVAL); - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, - gamma_lut, gamma_lut_size - 1), - -EINVAL); - igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_GAMMA_LUT, - gamma_lut, gamma_lut_size + sizeof(struct drm_color_lut)), - -EINVAL); - igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_GAMMA_LUT, pipe->crtc_id), - -EINVAL); - igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_GAMMA_LUT, 4096 * 4096), - -EINVAL); - } + free(gamma_lut); +} + +static void +invalid_degamma_lut_sizes(data_t *data) +{ + igt_display_t *display = &data->display; + igt_pipe_t *pipe = &display->pipes[0]; + size_t degamma_lut_size = data->degamma_lut_size * sizeof(struct drm_color_lut); + struct drm_color_lut *degamma_lut; + + igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_DEGAMMA_LUT)); + + degamma_lut = malloc(degamma_lut_size * 2); + + igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); + + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, + degamma_lut, 1), -EINVAL); + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, + degamma_lut, degamma_lut_size + 1), + -EINVAL); + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, + degamma_lut, degamma_lut_size - 1), + -EINVAL); + igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, + degamma_lut, degamma_lut_size + sizeof(struct drm_color_lut)), + -EINVAL); + igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_DEGAMMA_LUT, pipe->crtc_id), + -EINVAL); + igt_assert_eq(pipe_set_property_blob_id(pipe, IGT_CRTC_DEGAMMA_LUT, 4096 * 4096), + -EINVAL); free(degamma_lut); - free(gamma_lut); } static void @@ -1152,8 +1165,7 @@ invalid_ctm_matrix_sizes(data_t *data) igt_pipe_t *pipe = &display->pipes[0]; void *ptr; - if (!igt_pipe_obj_has_prop(pipe, IGT_CRTC_CTM)) - return; + igt_require(igt_pipe_obj_has_prop(pipe, IGT_CRTC_CTM)); ptr = malloc(sizeof(struct drm_color_ctm) * 4); @@ -1196,8 +1208,11 @@ igt_main igt_subtest_group run_tests_for_pipe(&data, pipe); - igt_subtest_f("pipe-invalid-lut-sizes") - invalid_lut_sizes(&data); + igt_subtest_f("pipe-invalid-gamma-lut-sizes") + invalid_gamma_lut_sizes(&data); + + igt_subtest_f("pipe-invalid-degamma-lut-sizes") + invalid_degamma_lut_sizes(&data); igt_subtest_f("pipe-invalid-ctm-matrix-sizes") invalid_ctm_matrix_sizes(&data); -- cgit v1.2.3