diff mbox

[3/7] tests/kms_fbc_crc: add wait_for_fbc_enabled()

Message ID 1427320239-25667-3-git-send-email-przanoni@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paulo Zanoni March 25, 2015, 9:50 p.m. UTC 
From: Paulo Zanoni <paulo.r.zanoni@intel.com>

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>
---
 tests/kms_fbc_crc.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Comments

Daniel Vetter March 26, 2015, 10:07 a.m. UTC | #1 
On Wed, Mar 25, 2015 at 06:50:35PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> 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>

If we go with my suggestion in the previous mail this would need a
configurable timeout - with just gem_bo_busy we'd need a 2second timeout
or similar.
-Daniel

> ---
>  tests/kms_fbc_crc.c | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
> index b3e6109..11078e0 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) {
>  		/*
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
index b3e6109..11078e0 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) {
 		/*