[igt-dev] [PATCH i-g-t v2 5/8] tests/fbcon_fbt: Add and use psr_long_wait_update() to test updates in PSR

[Maarten Lankhorst]

Op 27-03-2019 om 21:03 schreef José Roberto de Souza:
> After getting back to fbcon it tests if PSR had a update but since
> fbcon can take a while it have some big sleep in place, so what it
> is actualy testing is if fbcon is updating the screen.
> In this test the update of the screen comes from the fbcon cursor
> blinking, the problem is that 40ms is a small interval to detect
> cursor blinking and the test can fail some times, so a bigger timeout
> to wait for a update is need.
>
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
> ---
>  lib/igt_psr.c         | 5 +++++
>  lib/igt_psr.h         | 1 +
>  tests/kms_fbcon_fbt.c | 2 +-
>  3 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/lib/igt_psr.c b/lib/igt_psr.c
> index b5847bfd..b92ea73f 100644
> --- a/lib/igt_psr.c
> +++ b/lib/igt_psr.c
> @@ -54,6 +54,11 @@ bool psr_wait_update(int debugfs_fd, enum psr_mode mode)
>  	return igt_wait(!psr_active_check(debugfs_fd, mode), 40, 10);
>  }
>  
> +bool psr_long_wait_update(int debugfs_fd, enum psr_mode mode)
> +{
> +	return igt_wait(!psr_active_check(debugfs_fd, mode), 500, 10);
> +}
> +
>  static ssize_t psr_write(int debugfs_fd, const char *buf)
>  {
>  	return igt_sysfs_write(debugfs_fd, "i915_edp_psr_debug", buf,
> diff --git a/lib/igt_psr.h b/lib/igt_psr.h
> index 49599cf8..ca385736 100644
> --- a/lib/igt_psr.h
> +++ b/lib/igt_psr.h
> @@ -37,6 +37,7 @@ enum psr_mode {
>  
>  bool psr_wait_entry(int debugfs_fd, enum psr_mode mode);
>  bool psr_wait_update(int debugfs_fd, enum psr_mode mode);
> +bool psr_long_wait_update(int debugfs_fd, enum psr_mode mode);
>  bool psr_enable(int debugfs_fd, enum psr_mode);
>  bool psr_disable(int debugfs_fd);
>  bool psr_sink_support(int debugfs_fd, enum psr_mode);
> diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c
> index b57e5f51..0550034e 100644
> --- a/tests/kms_fbcon_fbt.c
> +++ b/tests/kms_fbcon_fbt.c
> @@ -203,7 +203,7 @@ static bool psr_supported_on_chipset(int debugfs_fd)
>  
>  static bool psr_wait_until_update(int debugfs_fd)
>  {
> -	return psr_wait_update(debugfs_fd, PSR_MODE_1);
> +	return psr_long_wait_update(debugfs_fd, PSR_MODE_1);
>  }
>  
>  static void disable_features(int debugfs_fd)

This patch and 4/8 should be merged? maybe merged with 3/8 as well?

~Maarten