[PATCH i-g-t 1/2] lib/igt_aux: Half the timeout for suspend to RAM and a third for suspend to disk.

[PATCH i-g-t 1/2] lib/igt_aux: Half the timeout for suspend to RAM and a third for suspend to disk.

[Marius Vlad]

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 lib/igt_aux.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index c32569f..fe18365 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -671,9 +671,9 @@ void igt_system_suspend_autoresume(void)
 	igt_skip_on_simulation();
 
 	/* skip if system doesn't support suspend-to-mem */
-	igt_require(system("rtcwake -n -s 30 -m mem" SQUELCH) == 0);
+	igt_require(system("rtcwake -n -s 15 -m mem" SQUELCH) == 0);
 
-	igt_assert_f(system("rtcwake -s 30 -m mem") == 0,
+	igt_assert_f(system("rtcwake -s 15 -m mem") == 0,
 		     "This failure means that something is wrong with the "
 		     "rtcwake tool or how your distro is set up. This is not "
 		     "a i915.ko or i-g-t bug.\n");
@@ -698,12 +698,12 @@ void igt_system_hibernate_autoresume(void)
 	igt_skip_on_simulation();
 
 	/* skip if system doesn't support suspend-to-disk */
-	igt_require(system("rtcwake -n -s 90 -m disk" SQUELCH) == 0);
+	igt_require(system("rtcwake -n -s 30 -m disk" SQUELCH) == 0);
 
 	/* The timeout might need to be adjusted if hibernation takes too long
 	 * or if we have to wait excessively long before resume
 	 */
-	igt_assert_f(system("rtcwake -s 90 -m disk") == 0,
+	igt_assert_f(system("rtcwake -s 30 -m disk") == 0,
 		     "This failure means that something is wrong with the "
 		     "rtcwake tool or how your distro is set up. This is not "
 		     "a i915.ko or i-g-t bug.\n");
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 2/2] tests/kms_flip: Half the duration time for basic-*vs-modeset/flip tests.

[Marius Vlad]

basic-flip-vs-dpms and basic-flip-vs-modeset together take roughly 2m
to run. Adjust the duration time to a maximum of 500ms.

Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 tests/kms_flip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 3d44544..fd8206f 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1458,7 +1458,7 @@ static int run_test(int duration, int flags)
 	}
 
 	igt_require(modes);
-	duration = duration * 1000 / modes;
+	duration = duration * 500 / modes;
 	duration = max(500, duration);
 
 	/* Find any connected displays */
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 1/2] lib/igt_aux: Half the timeout for suspend to RAM and a third for suspend to disk.

[Tomi Sarvela]

Fi CI has ran with this patch approx 2 weeks at January.

All platforms acted the same with or without patch.

Tomi


On Wednesday 20 April 2016 20:49:56 Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>  lib/igt_aux.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/igt_aux.c b/lib/igt_aux.c
> index c32569f..fe18365 100644
> --- a/lib/igt_aux.c
> +++ b/lib/igt_aux.c
> @@ -671,9 +671,9 @@ void igt_system_suspend_autoresume(void)
>  	igt_skip_on_simulation();
> 
>  	/* skip if system doesn't support suspend-to-mem */
> -	igt_require(system("rtcwake -n -s 30 -m mem" SQUELCH) == 0);
> +	igt_require(system("rtcwake -n -s 15 -m mem" SQUELCH) == 0);
> 
> -	igt_assert_f(system("rtcwake -s 30 -m mem") == 0,
> +	igt_assert_f(system("rtcwake -s 15 -m mem") == 0,
>  		     "This failure means that something is wrong with the "
>  		     "rtcwake tool or how your distro is set up. This is not "
>  		     "a i915.ko or i-g-t bug.\n");
> @@ -698,12 +698,12 @@ void igt_system_hibernate_autoresume(void)
>  	igt_skip_on_simulation();
> 
>  	/* skip if system doesn't support suspend-to-disk */
> -	igt_require(system("rtcwake -n -s 90 -m disk" SQUELCH) == 0);
> +	igt_require(system("rtcwake -n -s 30 -m disk" SQUELCH) == 0);
> 
>  	/* The timeout might need to be adjusted if hibernation takes too long
>  	 * or if we have to wait excessively long before resume
>  	 */
> -	igt_assert_f(system("rtcwake -s 90 -m disk") == 0,
> +	igt_assert_f(system("rtcwake -s 30 -m disk") == 0,
>  		     "This failure means that something is wrong with the "
>  		     "rtcwake tool or how your distro is set up. This is not "
>  		     "a i915.ko or i-g-t bug.\n");

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/2] tests/kms_flip: Half the duration time for basic-*vs-modeset/flip tests.

[Daniel Vetter]

On Wed, Apr 20, 2016 at 08:49:57PM +0300, Marius Vlad wrote:
> basic-flip-vs-dpms and basic-flip-vs-modeset together take roughly 2m
> to run. Adjust the duration time to a maximum of 500ms.

Can we have a notch more please? Ime it takes generally a few modesets for
this thing to fall over (2-3 modesets), are you sure the test still does
something useful in half a second? Mostly a modeset takes a lot longer
than that.

Also you just half the duration, but claim it goes from 2minutes to 500 ms
...

I'm confused.
-Daniel

> 
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>  tests/kms_flip.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index 3d44544..fd8206f 100644
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -1458,7 +1458,7 @@ static int run_test(int duration, int flags)
>  	}
>  
>  	igt_require(modes);
> -	duration = duration * 1000 / modes;
> +	duration = duration * 500 / modes;
>  	duration = max(500, duration);
>  
>  	/* Find any connected displays */
> -- 
> 2.5.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t 2/2] tests/kms_flip: Half the duration time for basic-*vs-modeset/flip tests.

[Marius Vlad]

[-- Attachment #1.1: Type: text/plain, Size: 1726 bytes --]

Grr, both of them take 2minutes, 1 minute each. What I meant was 30s
each. Got distracted a little bit, that the duration is adjusted to ms
further down the call.

On Thu, Apr 21, 2016 at 11:23:26AM +0200, Daniel Vetter wrote:
> On Wed, Apr 20, 2016 at 08:49:57PM +0300, Marius Vlad wrote:
> > basic-flip-vs-dpms and basic-flip-vs-modeset together take roughly 2m
> > to run. Adjust the duration time to a maximum of 500ms.
> 
> Can we have a notch more please? Ime it takes generally a few modesets for
> this thing to fall over (2-3 modesets), are you sure the test still does
> something useful in half a second? Mostly a modeset takes a lot longer
> than that.
Definitely not half a second...
> 
> Also you just half the duration, but claim it goes from 2minutes to 500 ms
> ...
> 
> I'm confused.
> -Daniel
> 
> > 
> > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> > ---
> >  tests/kms_flip.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> > index 3d44544..fd8206f 100644
> > --- a/tests/kms_flip.c
> > +++ b/tests/kms_flip.c
> > @@ -1458,7 +1458,7 @@ static int run_test(int duration, int flags)
> >  	}
> >  
> >  	igt_require(modes);
> > -	duration = duration * 1000 / modes;
> > +	duration = duration * 500 / modes;
> >  	duration = max(500, duration);
> >  
> >  	/* Find any connected displays */
> > -- 
> > 2.5.0
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx