lib/igt_aux: Half the timeout for suspend to RAM and a third for suspend to disk.
PATCH 1/2 lib/igt_aux: Half the timeout for suspend to RAM and a third for suspend to disk.
--- lib/igt_aux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
lib/igt_aux.c +4 -4
@@ -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" );
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 tests/kms_flip: Half the duration time for basic-*vs-modeset/flip tests.
basic-flip-vs-dpms and basic-flip-vs-modeset together take roughly 2m to run. Adjust the duration time to a maximum of 500ms.
--- tests/kms_flip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/kms_flip.c +1 -1
@@ -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 */
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] 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.
Quoted 2 lines · 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.
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
Quoted 26 lines
Signed-off-by Marius Vlad <[email protected]>--- tests/kms_flip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/kms_flip.c +1
-1@@ -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 */ Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] 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.
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.
Quoted 8 lines · Daniel Vetter
Quoted 2 lines · 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.
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...
Quoted 25 lines
Also you just half the duration, but claim it goes from 2minutes to 500 ms
...I'm confused.
-DanielQuoted 18 lines
Signed-off-by Marius Vlad <[email protected]>--- tests/kms_flip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/kms_flip.c +1
-1@@ -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);
Quoted 13 lines
Quoted 8 lines
tests/kms_flip.c +0
-0/* Find any connected displays */ Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Fi CI has ran with this patch approx 2 weeks at January.
All platforms acted the same with or without patch.
Tomi
Quoted 26 lines · On Wednesday 20 April 2016 20:49:56 Marius Vlad wrote:
Signed-off-by Marius Vlad <[email protected]>--- lib/igt_aux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)lib/igt_aux.c +2
-3@@ -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 );
lib/igt_aux.c void igt_system_hibernate_autoresume(void) · line 709
Quoted 10 lines
lib/igt_aux.c +2
-1+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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx