diff options
| author | Mika Kahola <mika.kahola@intel.com> | 2018-05-23 14:47:37 +0300 |
|---|---|---|
| committer | Mika Kahola <mika.kahola@intel.com> | 2018-05-24 10:14:09 +0300 |
| commit | 4d0920216bfbfe96a95c62eb6b04190c72aedeab (patch) | |
| tree | 808b074a438404561c3c4b2cdde899e6129065df /tests | |
| parent | 71c7a5740913d2618f44bca252669efe8a84f4c9 (diff) | |
tests: Move wait_for_pageflip as library function
Two tests uses the very same wait_for_pageflip() routine. These tests are
'kms_rotation_crc' and 'kms_flip_tiling'. In order to decrease code
repetition, let's move this function as part of kms function collection
in igt_kms.
No functional changes.
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kms_flip_tiling.c | 20 | ||||
| -rw-r--r-- | tests/kms_rotation_crc.c | 19 |
2 files changed, 2 insertions, 37 deletions
diff --git a/tests/kms_flip_tiling.c b/tests/kms_flip_tiling.c index 5aae29a8..beeb111b 100644 --- a/tests/kms_flip_tiling.c +++ b/tests/kms_flip_tiling.c @@ -30,7 +30,6 @@ #include <stdio.h> #include <string.h> - IGT_TEST_DESCRIPTION("Test page flips and tiling scenarios"); typedef struct { @@ -62,23 +61,6 @@ static void pipe_crc_free(void) } } -static void wait_for_pageflip(int fd) -{ - drmEventContext evctx = { .version = 2 }; - struct timeval timeout = { .tv_sec = 0, .tv_usec = 50000 }; - fd_set fds; - int ret; - - /* Wait for pageflip completion, then consume event on fd */ - FD_ZERO(&fds); - FD_SET(fd, &fds); - do { - ret = select(fd + 1, &fds, NULL, NULL, &timeout); - } while (ret < 0 && errno == EINTR); - igt_assert_eq(ret, 1); - igt_assert(drmHandleEvent(fd, &evctx) == 0); -} - static void test_flip_tiling(data_t *data, enum pipe pipe, igt_output_t *output, uint64_t tiling[2]) { @@ -139,7 +121,7 @@ test_flip_tiling(data_t *data, enum pipe pipe, igt_output_t *output, uint64_t ti */ igt_require(ret == 0); - wait_for_pageflip(data->drm_fd); + kmstest_wait_for_pageflip(data->drm_fd); /* Get a crc and compare with the reference. */ igt_pipe_crc_collect_crc(pipe_crc, &crc); diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index 0cd5c6e5..6cb5858a 100644 --- a/tests/kms_rotation_crc.c +++ b/tests/kms_rotation_crc.c @@ -284,23 +284,6 @@ static void prepare_fbs(data_t *data, igt_output_t *output, igt_plane_set_position(plane, data->pos_x, data->pos_y); } -static void wait_for_pageflip(int fd) -{ - drmEventContext evctx = { .version = 2 }; - struct timeval timeout = { .tv_sec = 0, .tv_usec = 50000 }; - fd_set fds; - int ret; - - /* Wait for pageflip completion, then consume event on fd */ - FD_ZERO(&fds); - FD_SET(fd, &fds); - do { - ret = select(fd + 1, &fds, NULL, NULL, &timeout); - } while (ret < 0 && errno == EINTR); - igt_assert_eq(ret, 1); - igt_assert(drmHandleEvent(fd, &evctx) == 0); -} - static void test_single_case(data_t *data, enum pipe pipe, igt_output_t *output, igt_plane_t *plane, enum rectangle_type rect, @@ -350,7 +333,7 @@ static void test_single_case(data_t *data, enum pipe pipe, NULL); igt_assert_eq(ret, 0); } - wait_for_pageflip(data->gfx_fd); + 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_assert_crc_equal(&data->flip_crc, |