diff mbox series

[i-g-t,RFC] tests/kms_flip.c: Fix subtests flip-vs-suspend

Message ID 1622175883-12405-1-git-send-email-vidya.srinivas@intel.com (mailing list archive)
State New, archived
Headers show
Series [i-g-t,RFC] tests/kms_flip.c: Fix subtests flip-vs-suspend | expand

Commit Message

Srinivas, Vidya May 28, 2021, 4:24 a.m. UTC
Some Intel Gen11 systems are not able to do a RTC wake.
Instead change the default SUSPEND_TEST_NONE to
SUSPEND_TEST_PLATFORM.

Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com>
---
 tests/kms_flip.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Mark Yacoub June 4, 2021, 6:46 p.m. UTC | #1
Tested it on ChromeOS and it runs well. But I think we should fix the
root cause instead.

On Fri, May 28, 2021 at 12:33 AM Vidya Srinivas
<vidya.srinivas@intel.com> wrote:
>
> Some Intel Gen11 systems are not able to do a RTC wake.
> Instead change the default SUSPEND_TEST_NONE to
> SUSPEND_TEST_PLATFORM.
>
Tested on ChromeOS on TGL (Delbin) and JSL (Drawlat)
Tested-by: Mark Yacoub <markyacoub@chromium.org>
> Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com>
> ---
>  tests/kms_flip.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index 8f736652be90..8afac88c9b15 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -835,7 +835,8 @@ static bool run_test_step(struct test_output *o, unsigned int *events)
>
>         if (o->flags & TEST_SUSPEND)
>                 igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
> -                                             SUSPEND_TEST_NONE);
> +                                             is_i915_device(drm_fd)?
> +                                             SUSPEND_TEST_PLATFORM:SUSPEND_TEST_NONE);
>
>         if (do_vblank && (o->flags & TEST_EINVAL) && o->vblank_state.count > 0)
>                 igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, &vbl_reply)
> --
> 2.7.4
>
Srinivas, Vidya June 5, 2021, 5:39 a.m. UTC | #2
Thank you so much Mark. This patch is not required. I have abandoned it.
We needed to stop tlsdate daemon which was holding the RTC lock (initctl stop tlsdated).

Apologies for the same.

Regards
Vidya

-----Original Message-----
From: Mark Yacoub <markyacoub@chromium.org> 
Sent: Saturday, June 5, 2021 12:17 AM
To: Srinivas, Vidya <vidya.srinivas@intel.com>
Cc: intel-gfx@lists.freedesktop.org; igt-dev@lists.freedesktop.org; Almahallawy, Khaled <khaled.almahallawy@intel.com>; Lin, Charlton <charlton.lin@intel.com>
Subject: Re: [PATCH i-g-t] [RFC] tests/kms_flip.c: Fix subtests flip-vs-suspend

Tested it on ChromeOS and it runs well. But I think we should fix the root cause instead.

On Fri, May 28, 2021 at 12:33 AM Vidya Srinivas <vidya.srinivas@intel.com> wrote:
>
> Some Intel Gen11 systems are not able to do a RTC wake.
> Instead change the default SUSPEND_TEST_NONE to SUSPEND_TEST_PLATFORM.
>
Tested on ChromeOS on TGL (Delbin) and JSL (Drawlat)
Tested-by: Mark Yacoub <markyacoub@chromium.org>
> Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com>
> ---
>  tests/kms_flip.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 
> 8f736652be90..8afac88c9b15 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -835,7 +835,8 @@ static bool run_test_step(struct test_output *o, 
> unsigned int *events)
>
>         if (o->flags & TEST_SUSPEND)
>                 igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
> -                                             SUSPEND_TEST_NONE);
> +                                             is_i915_device(drm_fd)?
> +                                             
> + SUSPEND_TEST_PLATFORM:SUSPEND_TEST_NONE);
>
>         if (do_vblank && (o->flags & TEST_EINVAL) && o->vblank_state.count > 0)
>                 igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, 
> &vbl_reply)
> --
> 2.7.4
>
diff mbox series

Patch

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 8f736652be90..8afac88c9b15 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -835,7 +835,8 @@  static bool run_test_step(struct test_output *o, unsigned int *events)
 
 	if (o->flags & TEST_SUSPEND)
 		igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
-					      SUSPEND_TEST_NONE);
+					      is_i915_device(drm_fd)?
+					      SUSPEND_TEST_PLATFORM:SUSPEND_TEST_NONE);
 
 	if (do_vblank && (o->flags & TEST_EINVAL) && o->vblank_state.count > 0)
 		igt_assert(do_wait_for_vblank(o, o->pipe, target_seq, &vbl_reply)