diff mbox

[i-g-t] kms_frontbuffer_tracking: Fix badstride test skipping with atomic

Message ID 20170221133709.11826-1-ander.conselvan.de.oliveira@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ander Conselvan de Oliveira Feb. 21, 2017, 1:37 p.m. UTC
In the new atomic reality, the page flip in the end of the badstride
test succeeds. That flip is to an fb which has a stride too large to
allow FBC to be enabled. Adjust the test expections accordingly.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 tests/kms_frontbuffer_tracking.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Zanoni, Paulo R Feb. 21, 2017, 2:43 p.m. UTC | #1
Em Ter, 2017-02-21 às 15:37 +0200, Ander Conselvan de Oliveira
escreveu:
> In the new atomic reality, the page flip in the end of the badstride
> test succeeds. That flip is to an fb which has a stride too large to
> allow FBC to be enabled. Adjust the test expections accordingly.

s/expections/expectations/

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> 
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.olivei
> ra@intel.com>
> ---
>  tests/kms_frontbuffer_tracking.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/kms_frontbuffer_tracking.c
> b/tests/kms_frontbuffer_tracking.c
> index 4f4848b..6d13e5d 100644
> --- a/tests/kms_frontbuffer_tracking.c
> +++ b/tests/kms_frontbuffer_tracking.c
> @@ -3031,7 +3031,7 @@ static void badstride_subtest(const struct
> test_mode *t)
>  	 */
>  	rc = drmModePageFlip(drm.fd, params->crtc_id, wide_fb.fb_id,
> 0, NULL);
>  	igt_assert(rc == -EINVAL || rc == 0);
> -	do_assertions(0);
> +	do_assertions(rc == 0 ? ASSERT_FBC_DISABLED : 0);
>  
>  	igt_remove_fb(drm.fd, &wide_fb);
>  }
Ander Conselvan de Oliveira Feb. 21, 2017, 2:46 p.m. UTC | #2
On Tue, 2017-02-21 at 11:43 -0300, Paulo Zanoni wrote:
> Em Ter, 2017-02-21 às 15:37 +0200, Ander Conselvan de Oliveira
> escreveu:
> > In the new atomic reality, the page flip in the end of the badstride
> > test succeeds. That flip is to an fb which has a stride too large to
> > allow FBC to be enabled. Adjust the test expections accordingly.
> 
> s/expections/expectations/

Fixed and pushed. 

Thanks,
Ander

> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> > 
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.olivei
> > ra@intel.com>
> > ---
> >  tests/kms_frontbuffer_tracking.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tests/kms_frontbuffer_tracking.c
> > b/tests/kms_frontbuffer_tracking.c
> > index 4f4848b..6d13e5d 100644
> > --- a/tests/kms_frontbuffer_tracking.c
> > +++ b/tests/kms_frontbuffer_tracking.c
> > @@ -3031,7 +3031,7 @@ static void badstride_subtest(const struct
> > test_mode *t)
> >  	 */
> >  	rc = drmModePageFlip(drm.fd, params->crtc_id, wide_fb.fb_id,
> > 0, NULL);
> >  	igt_assert(rc == -EINVAL || rc == 0);
> > -	do_assertions(0);
> > +	do_assertions(rc == 0 ? ASSERT_FBC_DISABLED : 0);
> >  
> >  	igt_remove_fb(drm.fd, &wide_fb);
> >  }
diff mbox

Patch

diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 4f4848b..6d13e5d 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -3031,7 +3031,7 @@  static void badstride_subtest(const struct test_mode *t)
 	 */
 	rc = drmModePageFlip(drm.fd, params->crtc_id, wide_fb.fb_id, 0, NULL);
 	igt_assert(rc == -EINVAL || rc == 0);
-	do_assertions(0);
+	do_assertions(rc == 0 ? ASSERT_FBC_DISABLED : 0);
 
 	igt_remove_fb(drm.fd, &wide_fb);
 }