summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2015-05-05 17:38:49 -0300
committerPaulo Zanoni <paulo.r.zanoni@intel.com>2015-05-14 10:02:07 -0300
commit8c3ac50b00d08daa4b0794d96e76cf78f1253940 (patch)
tree9c3dcf5ba51c654deb23475bd976a717a170e06e /tests
parent641d535a03ada74a3088309609a16c79076e6ccc (diff)
tests/kms_fbc_crc: exec_nop() can also invalidate FBC
So make sure that, at prepare_test(), we wait for FBC to be enabled again after we run the exec_nop() call. Since after this happens, we just assert fbc_enabled() at test_crc() instead of waiting for it to be enabled. This is now needed because we moved to software frontbuffer tracking, so it can take some considerable time for FBC to be reenabled after it is disabled. A previous version of this patch was just calling gem_sync() after exec_nop(). Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/kms_fbc_crc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
index 37527d8a..6022a6af 100644
--- a/tests/kms_fbc_crc.c
+++ b/tests/kms_fbc_crc.c
@@ -383,6 +383,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode)
* FBC RT address is left as disabled.
*/
exec_nop(data, data->fb[0].gem_handle, data->ctx[0]);
+ igt_assert(wait_for_fbc_enabled(data));
}
igt_wait_for_vblank(data->drm_fd, data->pipe);