diff mbox series

[i-g-t] tests/kms_vblank: Test if we have functional rpm before testing

Message ID 20180831130813.19014-1-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show
Series [i-g-t] tests/kms_vblank: Test if we have functional rpm before testing | expand

Commit Message

Chris Wilson Aug. 31, 2018, 1:08 p.m. UTC
We want to test that provoking a vblank interrupt works correctly after
waking up from runtime-pm. First though, we must wait for the device to
enter runtime-suspend. If the device cannot, e.g. we haven't enabled the
DMC firmware, the test should skip because our external requirements are
not met.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107768
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
---
 tests/kms_vblank.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Imre Deak Aug. 31, 2018, 1:30 p.m. UTC | #1
On Fri, Aug 31, 2018 at 02:08:13PM +0100, Chris Wilson wrote:
> We want to test that provoking a vblank interrupt works correctly after
> waking up from runtime-pm. First though, we must wait for the device to
> enter runtime-suspend. If the device cannot, e.g. we haven't enabled the
> DMC firmware, the test should skip because our external requirements are
> not met.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107768
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Imre Deak <imre.deak@intel.com>

Signed-off-by: Imre Deak <imre.deak@intel.com>

> ---
>  tests/kms_vblank.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
> index 508c0fa03..b3cd2d93c 100644
> --- a/tests/kms_vblank.c
> +++ b/tests/kms_vblank.c
> @@ -352,7 +352,7 @@ static void vblank_ts_cont(data_t *data, int fd, int nchildren)
>  	}
>  
>  	if (data->flags & RPM)
> -		igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
> +		igt_require(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
>  
>  	if (data->flags & SUSPEND)
>  		igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
> -- 
> 2.19.0.rc1
>
Imre Deak Aug. 31, 2018, 1:32 p.m. UTC | #2
On Fri, Aug 31, 2018 at 04:30:31PM +0300, Imre Deak wrote:
> On Fri, Aug 31, 2018 at 02:08:13PM +0100, Chris Wilson wrote:
> > We want to test that provoking a vblank interrupt works correctly after
> > waking up from runtime-pm. First though, we must wait for the device to
> > enter runtime-suspend. If the device cannot, e.g. we haven't enabled the
> > DMC firmware, the test should skip because our external requirements are
> > not met.
> > 
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107768
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Imre Deak <imre.deak@intel.com>
> 
> Signed-off-by: Imre Deak <imre.deak@intel.com>

I mean
Reviewed-by: Imre Deak <imre.deak@intel.com>

> 
> > ---
> >  tests/kms_vblank.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
> > index 508c0fa03..b3cd2d93c 100644
> > --- a/tests/kms_vblank.c
> > +++ b/tests/kms_vblank.c
> > @@ -352,7 +352,7 @@ static void vblank_ts_cont(data_t *data, int fd, int nchildren)
> >  	}
> >  
> >  	if (data->flags & RPM)
> > -		igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
> > +		igt_require(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
> >  
> >  	if (data->flags & SUSPEND)
> >  		igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
> > -- 
> > 2.19.0.rc1
> > 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
diff mbox series

Patch

diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
index 508c0fa03..b3cd2d93c 100644
--- a/tests/kms_vblank.c
+++ b/tests/kms_vblank.c
@@ -352,7 +352,7 @@  static void vblank_ts_cont(data_t *data, int fd, int nchildren)
 	}
 
 	if (data->flags & RPM)
-		igt_assert(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
+		igt_require(igt_wait_for_pm_status(IGT_RUNTIME_PM_STATUS_SUSPENDED));
 
 	if (data->flags & SUSPEND)
 		igt_system_suspend_autoresume(SUSPEND_STATE_MEM,