diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-07-24 15:59:26 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-08-14 17:35:12 +0200 |
| commit | 5d1c82954995b36943ed7f812bf9637ce3fbd47d (patch) | |
| tree | e91cb173cc1d5ad01479869faeefc23fab376293 /tests/kms_rotation_crc.c | |
| parent | deead1d39368ac11a66f0d9def39f75d1db7e78b (diff) | |
tests: Replace calls to igt_pipe_crc_drain + get_single with igt_pipe_crc_get_current()
This is a more race free of accomplishing the same.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests/kms_rotation_crc.c')
| -rw-r--r-- | tests/kms_rotation_crc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index 6cb5858a..b994cc5d 100644 --- a/tests/kms_rotation_crc.c +++ b/tests/kms_rotation_crc.c @@ -235,8 +235,8 @@ static void prepare_fbs(data_t *data, igt_output_t *output, if (plane->type != DRM_PLANE_TYPE_CURSOR) igt_plane_set_position(plane, data->pos_x, data->pos_y); igt_display_commit2(display, COMMIT_ATOMIC); - igt_pipe_crc_drain(data->pipe_crc); - igt_pipe_crc_get_single(data->pipe_crc, &data->flip_crc); + + igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &data->flip_crc); /* * Prepare the non-rotated flip fb. @@ -259,8 +259,7 @@ static void prepare_fbs(data_t *data, igt_output_t *output, igt_plane_set_position(plane, data->pos_x, data->pos_y); igt_display_commit2(display, COMMIT_ATOMIC); - igt_pipe_crc_drain(data->pipe_crc); - igt_pipe_crc_get_single(data->pipe_crc, &data->ref_crc); + igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &data->ref_crc); /* * Prepare the non-rotated reference fb. @@ -310,8 +309,7 @@ static void test_single_case(data_t *data, enum pipe pipe, igt_assert_eq(ret, 0); /* Check CRC */ - igt_pipe_crc_drain(data->pipe_crc); - igt_pipe_crc_get_single(data->pipe_crc, &crc_output); + igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc_output); igt_assert_crc_equal(&data->ref_crc, &crc_output); /* @@ -334,8 +332,7 @@ static void test_single_case(data_t *data, enum pipe pipe, igt_assert_eq(ret, 0); } kmstest_wait_for_pageflip(data->gfx_fd); - igt_pipe_crc_drain(data->pipe_crc); - igt_pipe_crc_get_single(data->pipe_crc, &crc_output); + igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc_output); igt_assert_crc_equal(&data->flip_crc, &crc_output); } |