diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-12-05 13:40:00 -0200 |
---|---|---|
committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2015-05-05 17:28:18 -0300 |
commit | 26ff2c7daac88e12969530a62703913ba9ee0fe3 (patch) | |
tree | f4ad198a8af444499841af8109ae20479d99a954 /tests | |
parent | 9bb04d3aa6a2b1b86e091967e312a19ce337df4d (diff) |
tests/kms_fbc_crc: add wait_for_fbc_enabled()
The code has a common pattern of "wait 300ms, then check if FBC is
enabled". Most of the time FBC is enabled in either 50ms or 0ms, so
introduce wait_for_fbc_enabled(), which can return much earlier if FBC
is actually enabled before the 300ms timeout.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_fbc_crc.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c index 1320bad3..613472f0 100644 --- a/tests/kms_fbc_crc.c +++ b/tests/kms_fbc_crc.c @@ -28,6 +28,7 @@ #include <string.h> #include "drmtest.h" +#include "igt_aux.h" #include "igt_debugfs.h" #include "igt_kms.h" #include "intel_chipset.h" @@ -203,6 +204,11 @@ static bool fbc_enabled(data_t *data) return strstr(str, "FBC enabled") != NULL; } +static bool wait_for_fbc_enabled(data_t *data) +{ + return igt_wait(fbc_enabled(data), 300, 30); +} + static void test_crc(data_t *data, enum test_mode mode) { uint32_t crtc_id = data->output->config.crtc->crtc_id; @@ -216,9 +222,8 @@ static void test_crc(data_t *data, enum test_mode mode) handle = data->handle[1]; igt_assert(drmModePageFlip(data->drm_fd, crtc_id, data->fb_id[1], 0, NULL) == 0); - usleep(300000); - igt_assert(fbc_enabled(data)); + igt_assert(wait_for_fbc_enabled(data)); } switch (mode) { @@ -277,9 +282,7 @@ static void test_crc(data_t *data, enum test_mode mode) * Allow time for FBC to kick in again if it * got disabled during dirtyfb or page flip. */ - usleep(300000); - - igt_assert(fbc_enabled(data)); + igt_assert(wait_for_fbc_enabled(data)); igt_pipe_crc_start(pipe_crc); igt_pipe_crc_get_crcs(pipe_crc, 1, &crcs); @@ -338,9 +341,8 @@ static bool prepare_test(data_t *data, enum test_mode test_mode) /* scanout = fb[1] */ igt_plane_set_fb(data->primary, &data->fb[1]); igt_display_commit(display); - usleep(300000); - if (!fbc_enabled(data)) { + if (!wait_for_fbc_enabled(data)) { igt_info("FBC not enabled\n"); igt_plane_set_fb(data->primary, NULL); @@ -388,9 +390,8 @@ static bool prepare_test(data_t *data, enum test_mode test_mode) /* scanout = fb[0] */ igt_plane_set_fb(data->primary, &data->fb[0]); igt_display_commit(display); - usleep(300000); - igt_assert(fbc_enabled(data)); + igt_assert(wait_for_fbc_enabled(data)); if (test_mode == TEST_CONTEXT || test_mode == TEST_PAGE_FLIP_AND_CONTEXT) { /* |