[PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Marta Lofstedt]

The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
display engine blending to be setup inorder to work in the same
manner as the respective tests for the primary plane.

Since, it is not the objective of the kms_rotation_crc to test our
display blend capabilities, these subtests should be removed.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691

Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
---
 tests/kms_rotation_crc.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 21e264ad..064d4293 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -647,9 +647,6 @@ igt_main
 		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_90, 0 },
 		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_180, 0 },
 		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_270, 0 },
-		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_90, 1 },
-		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_180, 1 },
-		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_270, 1 },
 		{ DRM_PLANE_TYPE_CURSOR, IGT_ROTATION_180, 0 },
 		{ 0, 0, 0}
 	};
-- 
2.11.0

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

Re: [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Ville Syrjälä]

On Tue, Sep 19, 2017 at 03:31:21PM +0300, Marta Lofstedt wrote:
> The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
> display engine blending to be setup inorder to work in the same
> manner as the respective tests for the primary plane.

Hmm. I don't see anything really blending related in there. It's
just using regular old XRGB framebuffers which means blending will
be off.

> 
> Since, it is not the objective of the kms_rotation_crc to test our
> display blend capabilities, these subtests should be removed.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
> 
> Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
> ---
>  tests/kms_rotation_crc.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
> index 21e264ad..064d4293 100644
> --- a/tests/kms_rotation_crc.c
> +++ b/tests/kms_rotation_crc.c
> @@ -647,9 +647,6 @@ igt_main
>  		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_90, 0 },
>  		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_180, 0 },
>  		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_270, 0 },
> -		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_90, 1 },
> -		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_180, 1 },
> -		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_270, 1 },

You didn't actually remove all of them.

>  		{ DRM_PLANE_TYPE_CURSOR, IGT_ROTATION_180, 0 },
>  		{ 0, 0, 0}
>  	};
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Lofstedt, Marta]

> -----Original Message-----
> From: Ville Syrjälä [mailto:ville.syrjala@linux.intel.com]
> Sent: Tuesday, September 19, 2017 4:02 PM
> To: Lofstedt, Marta <marta.lofstedt@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests
> for sprite plane
> 
> On Tue, Sep 19, 2017 at 03:31:21PM +0300, Marta Lofstedt wrote:
> > The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
> > display engine blending to be setup inorder to work in the same manner
> > as the respective tests for the primary plane.
> 
> Hmm. I don't see anything really blending related in there. It's just using
> regular old XRGB framebuffers which means blending will be off.
> 
Exactly, the overlay isn't belended against anything hence we are not seeing
The same result as for the primary plane.

> >
> > Since, it is not the objective of the kms_rotation_crc to test our
> > display blend capabilities, these subtests should be removed.
> >
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
> >
> > Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
> > ---
> >  tests/kms_rotation_crc.c | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index
> > 21e264ad..064d4293 100644
> > --- a/tests/kms_rotation_crc.c
> > +++ b/tests/kms_rotation_crc.c
> > @@ -647,9 +647,6 @@ igt_main
> >  		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_90, 0 },
> >  		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_180, 0 },
> >  		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_270, 0 },
> > -		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_90, 1 },
> > -		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_180, 1 },
> > -		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_270, 1 },
> 
> You didn't actually remove all of them.
> 
> >  		{ DRM_PLANE_TYPE_CURSOR,
> IGT_ROTATION_180, 0 },
> >  		{ 0, 0, 0}
> >  	};
> > --
> > 2.11.0
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> --
> Ville Syrjälä
> Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Ville Syrjälä]

On Tue, Sep 19, 2017 at 04:01:42PM +0300, Ville Syrjälä wrote:
> On Tue, Sep 19, 2017 at 03:31:21PM +0300, Marta Lofstedt wrote:
> > The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
> > display engine blending to be setup inorder to work in the same
> > manner as the respective tests for the primary plane.
> 
> Hmm. I don't see anything really blending related in there. It's
> just using regular old XRGB framebuffers which means blending will
> be off.

OK. So the actual problem is that the test calls drmModePageFlip()
expecting it to magically do something for the sprite plane.
drmModePageFlip() by definition only operates on the primary plane of
the crtc. So the fix looks correct (ie. get rid of the "flip" tests for
the sprite planes) but the commit message is incorrect. This also
explains why you only had to remove the tests with flip==1 and didn't
have to remove the flip==0 tests.

> 
> > 
> > Since, it is not the objective of the kms_rotation_crc to test our
> > display blend capabilities, these subtests should be removed.
> > 
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
> > 
> > Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
> > ---
> >  tests/kms_rotation_crc.c | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
> > index 21e264ad..064d4293 100644
> > --- a/tests/kms_rotation_crc.c
> > +++ b/tests/kms_rotation_crc.c
> > @@ -647,9 +647,6 @@ igt_main
> >  		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_90, 0 },
> >  		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_180, 0 },
> >  		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_270, 0 },
> > -		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_90, 1 },
> > -		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_180, 1 },
> > -		{ DRM_PLANE_TYPE_OVERLAY, IGT_ROTATION_270, 1 },
> 
> You didn't actually remove all of them.
> 
> >  		{ DRM_PLANE_TYPE_CURSOR, IGT_ROTATION_180, 0 },
> >  		{ 0, 0, 0}
> >  	};
> > -- 
> > 2.11.0
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Lofstedt, Marta]

> -----Original Message-----
> From: Ville Syrjälä [mailto:ville.syrjala@linux.intel.com]
> Sent: Tuesday, September 19, 2017 4:13 PM
> To: Lofstedt, Marta <marta.lofstedt@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests
> for sprite plane
> 
> On Tue, Sep 19, 2017 at 04:01:42PM +0300, Ville Syrjälä wrote:
> > On Tue, Sep 19, 2017 at 03:31:21PM +0300, Marta Lofstedt wrote:
> > > The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
> > > display engine blending to be setup inorder to work in the same
> > > manner as the respective tests for the primary plane.
> >
> > Hmm. I don't see anything really blending related in there. It's just
> > using regular old XRGB framebuffers which means blending will be off.
> 
> OK. So the actual problem is that the test calls drmModePageFlip() expecting
> it to magically do something for the sprite plane.
> drmModePageFlip() by definition only operates on the primary plane of the
> crtc. So the fix looks correct (ie. get rid of the "flip" tests for the sprite planes)
> but the commit message is incorrect. This also explains why you only had to
> remove the tests with flip==1 and didn't have to remove the flip==0 tests.

Thanks Ville, I agree.

> 
> >
> > >
> > > Since, it is not the objective of the kms_rotation_crc to test our
> > > display blend capabilities, these subtests should be removed.
> > >
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
> > >
> > > Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
> > > ---
> > >  tests/kms_rotation_crc.c | 3 ---
> > >  1 file changed, 3 deletions(-)
> > >
> > > diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
> > > index 21e264ad..064d4293 100644
> > > --- a/tests/kms_rotation_crc.c
> > > +++ b/tests/kms_rotation_crc.c
> > > @@ -647,9 +647,6 @@ igt_main
> > >  		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_90, 0 },
> > >  		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_180, 0 },
> > >  		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_270, 0 },
> > > -		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_90, 1 },
> > > -		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_180, 1 },
> > > -		{ DRM_PLANE_TYPE_OVERLAY,
> IGT_ROTATION_270, 1 },
> >
> > You didn't actually remove all of them.
> >
> > >  		{ DRM_PLANE_TYPE_CURSOR,
> IGT_ROTATION_180, 0 },
> > >  		{ 0, 0, 0}
> > >  	};
> > > --
> > > 2.11.0
> > >
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> > --
> > Ville Syrjälä
> > Intel OTC
> 
> --
> Ville Syrjälä
> Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Tvrtko Ursulin]

On 19/09/2017 14:13, Ville Syrjälä wrote:
> On Tue, Sep 19, 2017 at 04:01:42PM +0300, Ville Syrjälä wrote:
>> On Tue, Sep 19, 2017 at 03:31:21PM +0300, Marta Lofstedt wrote:
>>> The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
>>> display engine blending to be setup inorder to work in the same
>>> manner as the respective tests for the primary plane.
>>
>> Hmm. I don't see anything really blending related in there. It's
>> just using regular old XRGB framebuffers which means blending will
>> be off.
> 
> OK. So the actual problem is that the test calls drmModePageFlip()
> expecting it to magically do something for the sprite plane.
> drmModePageFlip() by definition only operates on the primary plane of
> the crtc. So the fix looks correct (ie. get rid of the "flip" tests for
> the sprite planes) but the commit message is incorrect. This also
> explains why you only had to remove the tests with flip==1 and didn't
> have to remove the flip==0 tests.

Is it possible to flip on the sprite planes? If so would there be value 
with keeping the tests? Just replacing the flip with some other magic 
ioctl so those code paths are checked as well.

Also, important thing to note is that with 90/270 the test fails before 
the CRC check with a failure from drm_framebuffer_check_src_coords. Not 
sure if that is something to investigate or another test code failure?

Regards,

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

Re: [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Ville Syrjälä]

On Tue, Sep 19, 2017 at 02:52:12PM +0100, Tvrtko Ursulin wrote:
> 
> On 19/09/2017 14:13, Ville Syrjälä wrote:
> > On Tue, Sep 19, 2017 at 04:01:42PM +0300, Ville Syrjälä wrote:
> >> On Tue, Sep 19, 2017 at 03:31:21PM +0300, Marta Lofstedt wrote:
> >>> The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
> >>> display engine blending to be setup inorder to work in the same
> >>> manner as the respective tests for the primary plane.
> >>
> >> Hmm. I don't see anything really blending related in there. It's
> >> just using regular old XRGB framebuffers which means blending will
> >> be off.
> > 
> > OK. So the actual problem is that the test calls drmModePageFlip()
> > expecting it to magically do something for the sprite plane.
> > drmModePageFlip() by definition only operates on the primary plane of
> > the crtc. So the fix looks correct (ie. get rid of the "flip" tests for
> > the sprite planes) but the commit message is incorrect. This also
> > explains why you only had to remove the tests with flip==1 and didn't
> > have to remove the flip==0 tests.
> 
> Is it possible to flip on the sprite planes? If so would there be value 
> with keeping the tests? Just replacing the flip with some other magic 
> ioctl so those code paths are checked as well.

Setplane is the "legacy" ioctl to flip planes. In the past that took a
totally different path through the driver so testing the pageflip ioctl
separately made a ton of sense. These days both the pageflip and
setplane ioctl both get converted into an atomic update internally, so
from a pure driver code perspective they're pretty much identical.

So I supposse converting it over to setplane would be OKish. That
would mean ripping out the flip event handling from the code as well.

> 
> Also, important thing to note is that with 90/270 the test fails before 
> the CRC check with a failure from drm_framebuffer_check_src_coords. Not 
> sure if that is something to investigate or another test code failure?

That is potentially due to not using atomic and having a framebuffer
that can't accomodate both orientations. So either the plane would have
to disabled before changing the rotation and re-enabled with the new fb
afterwards, or the fb would have to be allocated to have
max(w,h) x max(w,h) dimensions to accomodate both orientations.

With atomic we can do the rotation change and the fb change at the same
time, so there is no problematic intermediate state that could exceed
the fb dimensions.
 
-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests for sprite plane

[Lofstedt, Marta]

When I have some time I will try to fix the test instead of deleting it.

/Marta 

> -----Original Message-----
> From: Ville Syrjälä [mailto:ville.syrjala@linux.intel.com]
> Sent: Tuesday, September 19, 2017 5:30 PM
> To: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: Lofstedt, Marta <marta.lofstedt@intel.com>; intel-
> gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH i-g-t] igt/kms_rotation_crc : Remove flip tests
> for sprite plane
> 
> On Tue, Sep 19, 2017 at 02:52:12PM +0100, Tvrtko Ursulin wrote:
> >
> > On 19/09/2017 14:13, Ville Syrjälä wrote:
> > > On Tue, Sep 19, 2017 at 04:01:42PM +0300, Ville Syrjälä wrote:
> > >> On Tue, Sep 19, 2017 at 03:31:21PM +0300, Marta Lofstedt wrote:
> > >>> The kms_rotation_crc@sprite-rotation-*-flip subtests, would need
> > >>> display engine blending to be setup inorder to work in the same
> > >>> manner as the respective tests for the primary plane.
> > >>
> > >> Hmm. I don't see anything really blending related in there. It's
> > >> just using regular old XRGB framebuffers which means blending will
> > >> be off.
> > >
> > > OK. So the actual problem is that the test calls drmModePageFlip()
> > > expecting it to magically do something for the sprite plane.
> > > drmModePageFlip() by definition only operates on the primary plane
> > > of the crtc. So the fix looks correct (ie. get rid of the "flip"
> > > tests for the sprite planes) but the commit message is incorrect.
> > > This also explains why you only had to remove the tests with flip==1
> > > and didn't have to remove the flip==0 tests.
> >
> > Is it possible to flip on the sprite planes? If so would there be
> > value with keeping the tests? Just replacing the flip with some other
> > magic ioctl so those code paths are checked as well.
> 
> Setplane is the "legacy" ioctl to flip planes. In the past that took a totally
> different path through the driver so testing the pageflip ioctl separately
> made a ton of sense. These days both the pageflip and setplane ioctl both
> get converted into an atomic update internally, so from a pure driver code
> perspective they're pretty much identical.
> 
> So I supposse converting it over to setplane would be OKish. That would
> mean ripping out the flip event handling from the code as well.
> 
> >
> > Also, important thing to note is that with 90/270 the test fails
> > before the CRC check with a failure from
> > drm_framebuffer_check_src_coords. Not sure if that is something to
> investigate or another test code failure?
> 
> That is potentially due to not using atomic and having a framebuffer that
> can't accomodate both orientations. So either the plane would have to
> disabled before changing the rotation and re-enabled with the new fb
> afterwards, or the fb would have to be allocated to have
> max(w,h) x max(w,h) dimensions to accomodate both orientations.
> 
> With atomic we can do the rotation change and the fb change at the same
> time, so there is no problematic intermediate state that could exceed the fb
> dimensions.
> 
> --
> Ville Syrjälä
> Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t] igt/kms_rotation_crc : Fix flip tests for sprite plane

[Maarten Lankhorst]

Op 20-09-17 om 13:33 schreef Lofstedt, Marta:
> When I have some time I will try to fix the test instead of deleting it.
>
> /Marta 

Was taking a look at the bug too, came to the same conclusion..
---8<----
This test was flipping the primary plane instead of the sprite plane.
Flip the correct plane to make the test pass properly.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 21e264addc09..69301252bda1 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -332,6 +332,9 @@ static void test_plane_rotation(data_t *data, int plane_type)
 	enum igt_commit_style commit = COMMIT_LEGACY;
 	int ret;
 
+	if (data->flips && plane_type != DRM_PLANE_TYPE_PRIMARY)
+		igt_require(data->display.is_atomic);
+
 	if (plane_type == DRM_PLANE_TYPE_PRIMARY || plane_type == DRM_PLANE_TYPE_CURSOR)
 		commit = COMMIT_UNIVERSAL;
 
@@ -390,12 +393,20 @@ static void test_plane_rotation(data_t *data, int plane_type)
 			 * check CRC against that one as well.
 			 */
 			if (data->flips) {
-				ret = drmModePageFlip(data->gfx_fd,
-						      output->config.crtc->crtc_id,
-						      data->fb_flip.fb_id,
-						      DRM_MODE_PAGE_FLIP_EVENT,
-						      NULL);
-				igt_assert_eq(ret, 0);
+				igt_plane_set_fb(plane, &data->fb_flip);
+				if (data->rotation == IGT_ROTATION_90 || data->rotation == IGT_ROTATION_270)
+					igt_plane_set_size(plane, data->fb.height, data->fb.width);
+
+				if (plane_type != DRM_PLANE_TYPE_PRIMARY) {
+					igt_display_commit_atomic(display, DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK, NULL);
+				} else {
+					ret = drmModePageFlip(data->gfx_fd,
+							output->config.crtc->crtc_id,
+							data->fb_flip.fb_id,
+							DRM_MODE_PAGE_FLIP_EVENT,
+							NULL);
+					igt_assert_eq(ret, 0);
+				}
 				wait_for_pageflip(data->gfx_fd);
 				igt_pipe_crc_collect_crc(data->pipe_crc,
 							 &crc_output);

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

[PATCH i-g-t] igt/kms_rotation_crc : Fix flip tests for sprite plane

[Maarten Lankhorst]

This test was flipping the primary plane instead of the sprite plane.
Flip the correct plane to make the test pass properly.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
Resend for CI.

 tests/kms_rotation_crc.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 21e264addc09..69301252bda1 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -332,6 +332,9 @@ static void test_plane_rotation(data_t *data, int plane_type)
 	enum igt_commit_style commit = COMMIT_LEGACY;
 	int ret;
 
+	if (data->flips && plane_type != DRM_PLANE_TYPE_PRIMARY)
+		igt_require(data->display.is_atomic);
+
 	if (plane_type == DRM_PLANE_TYPE_PRIMARY || plane_type == DRM_PLANE_TYPE_CURSOR)
 		commit = COMMIT_UNIVERSAL;
 
@@ -390,12 +393,20 @@ static void test_plane_rotation(data_t *data, int plane_type)
 			 * check CRC against that one as well.
 			 */
 			if (data->flips) {
-				ret = drmModePageFlip(data->gfx_fd,
-						      output->config.crtc->crtc_id,
-						      data->fb_flip.fb_id,
-						      DRM_MODE_PAGE_FLIP_EVENT,
-						      NULL);
-				igt_assert_eq(ret, 0);
+				igt_plane_set_fb(plane, &data->fb_flip);
+				if (data->rotation == IGT_ROTATION_90 || data->rotation == IGT_ROTATION_270)
+					igt_plane_set_size(plane, data->fb.height, data->fb.width);
+
+				if (plane_type != DRM_PLANE_TYPE_PRIMARY) {
+					igt_display_commit_atomic(display, DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK, NULL);
+				} else {
+					ret = drmModePageFlip(data->gfx_fd,
+							output->config.crtc->crtc_id,
+							data->fb_flip.fb_id,
+							DRM_MODE_PAGE_FLIP_EVENT,
+							NULL);
+					igt_assert_eq(ret, 0);
+				}
 				wait_for_pageflip(data->gfx_fd);
 				igt_pipe_crc_collect_crc(data->pipe_crc,
 							 &crc_output);
-- 
2.14.1

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

Re: [PATCH i-g-t] igt/kms_rotation_crc : Fix flip tests for sprite plane

[Lofstedt, Marta]

Thanks Maarten,

Tested-by: Marta Lofstedt <marta.lofstedt@intel.com>
Acked-by: Marta Lofstedt <marta.lofstedt@intel.com>

> -----Original Message-----
> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Maarten Lankhorst
> Sent: Thursday, September 21, 2017 9:38 AM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH i-g-t] igt/kms_rotation_crc : Fix flip tests for sprite
> plane
> 
> This test was flipping the primary plane instead of the sprite plane.
> Flip the correct plane to make the test pass properly.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102691
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> Resend for CI.
> 
>  tests/kms_rotation_crc.c | 23 +++++++++++++++++------
>  1 file changed, 17 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index
> 21e264addc09..69301252bda1 100644
> --- a/tests/kms_rotation_crc.c
> +++ b/tests/kms_rotation_crc.c
> @@ -332,6 +332,9 @@ static void test_plane_rotation(data_t *data, int
> plane_type)
>  	enum igt_commit_style commit = COMMIT_LEGACY;
>  	int ret;
> 
> +	if (data->flips && plane_type != DRM_PLANE_TYPE_PRIMARY)
> +		igt_require(data->display.is_atomic);
> +
>  	if (plane_type == DRM_PLANE_TYPE_PRIMARY || plane_type
> == DRM_PLANE_TYPE_CURSOR)
>  		commit = COMMIT_UNIVERSAL;
> 
> @@ -390,12 +393,20 @@ static void test_plane_rotation(data_t *data, int
> plane_type)
>  			 * check CRC against that one as
> well.
>  			 */
>  			if (data->flips) {
> -				ret =
> drmModePageFlip(data->gfx_fd,
> -
> 	      output->config.crtc->crtc_id,
> -
> 	      data->fb_flip.fb_id,
> -
> 	      DRM_MODE_PAGE_FLIP_EVENT,
> -
> 	      NULL);
> -				igt_assert_eq(ret,
> 0);
> +
> 	igt_plane_set_fb(plane, &data->fb_flip);
> +				if (data->rotation
> == IGT_ROTATION_90 || data->rotation == IGT_ROTATION_270)
> +
> 	igt_plane_set_size(plane, data->fb.height, data->fb.width);
> +
> +				if (plane_type !=
> DRM_PLANE_TYPE_PRIMARY) {
> +
> 	igt_display_commit_atomic(display,
> DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK,
> NULL);
> +				} else {
> +					ret =
> drmModePageFlip(data->gfx_fd,
> +
> 		output->config.crtc->crtc_id,
> +
> 		data->fb_flip.fb_id,
> +
> 		DRM_MODE_PAGE_FLIP_EVENT,
> +
> 		NULL);
> +
> 	igt_assert_eq(ret, 0);
> +				}
> 
> 	wait_for_pageflip(data->gfx_fd);
> 
> 	igt_pipe_crc_collect_crc(data->pipe_crc,
> 
> 		 &crc_output);
> --
> 2.14.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for igt/kms_rotation_crc : Remove flip tests for sprite plane

[Patchwork]

== Series Details ==

Series: igt/kms_rotation_crc : Remove flip tests for sprite plane
URL   : https://patchwork.freedesktop.org/series/30588/
State : failure

== Summary ==

IGT patchset tested on top of latest successful build
da197b5f3cb516aaaea72d0d60b0f5c1c81081dd igt/gem_eio: Add another variant of in-flight to avoid request coalescing

with latest DRM-Tip kernel build CI_DRM_3111
85e28edde5bf drm-tip: 2017y-09m-19d-23h-07m-57s UTC integration manifest

Test chamelium:
        Subgroup dp-edid-read:
                pass       -> FAIL       (fi-kbl-7500u) fdo#102672
        Subgroup hdmi-hpd-fast:
                fail       -> SKIP       (fi-kbl-7500u)
Test gem_mmap_gtt:
        Subgroup basic-wc:
                pass       -> DMESG-WARN (fi-kbl-7500u)
        Subgroup basic-write-read:
                pass       -> DMESG-WARN (fi-kbl-7500u)
Test gem_pwrite:
        Subgroup basic:
                pass       -> DMESG-WARN (fi-kbl-7500u)
Test kms_addfb_basic:
        Subgroup bad-pitch-0:
                pass       -> DMESG-WARN (fi-kbl-7500u)
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                fail       -> PASS       (fi-snb-2600) fdo#100215
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> INCOMPLETE (fi-kbl-7500u)
Test drv_module_reload:
        Subgroup basic-reload:
                dmesg-warn -> PASS       (fi-glk-1) fdo#102777 +1

fdo#102672 https://bugs.freedesktop.org/show_bug.cgi?id=102672
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:450s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:468s
fi-blb-e6850     total:289  pass:224  dwarn:1   dfail:0   fail:0   skip:64  time:420s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:527s
fi-bwr-2160      total:289  pass:184  dwarn:0   dfail:0   fail:0   skip:105 time:276s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:509s
fi-byt-j1900     total:289  pass:254  dwarn:1   dfail:0   fail:0   skip:34  time:508s
fi-byt-n2820     total:289  pass:250  dwarn:1   dfail:0   fail:0   skip:38  time:500s
fi-cfl-s         total:289  pass:223  dwarn:34  dfail:0   fail:0   skip:32  time:547s
fi-elk-e7500     total:289  pass:230  dwarn:0   dfail:0   fail:0   skip:59  time:419s
fi-glk-1         total:289  pass:259  dwarn:1   dfail:0   fail:0   skip:29  time:571s
fi-hsw-4770      total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:427s
fi-hsw-4770r     total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:406s
fi-ilk-650       total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:432s
fi-ivb-3520m     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:484s
fi-ivb-3770      total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:464s
fi-kbl-7500u     total:245  pass:218  dwarn:5   dfail:0   fail:1   skip:20 
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:579s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:589s
fi-pnv-d510      total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:543s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:754s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:492s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:472s
fi-snb-2520m     total:289  pass:251  dwarn:0   dfail:0   fail:0   skip:38  time:576s
fi-snb-2600      total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:415s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_230/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for igt/kms_rotation_crc : Remove flip tests for sprite plane (rev3)

[Patchwork]

== Series Details ==

Series: igt/kms_rotation_crc : Remove flip tests for sprite plane (rev3)
URL   : https://patchwork.freedesktop.org/series/30588/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
6e2622564dc85875ee9e2f22874f9607cf0cdd9c meson: share the configuration_data object

with latest DRM-Tip kernel build CI_DRM_3117
bed15796ff69 drm-tip: 2017y-09m-20d-20h-05m-31s UTC integration manifest

Test gem_exec_suspend:
        Subgroup basic-s3:
                pass       -> INCOMPLETE (fi-kbl-7500u) fdo#102850
Test gem_ringfill:
        Subgroup basic-default-hang:
                pass       -> DMESG-WARN (fi-pnv-d510) fdo#101600
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-atomic:
                fail       -> PASS       (fi-snb-2600) fdo#100215
Test pm_rpm:
        Subgroup basic-rte:
                dmesg-warn -> PASS       (fi-cfl-s) fdo#102294
Test drv_module_reload:
        Subgroup basic-reload:
                pass       -> DMESG-WARN (fi-glk-1) fdo#102777

fdo#102850 https://bugs.freedesktop.org/show_bug.cgi?id=102850
fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:447s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:471s
fi-blb-e6850     total:289  pass:224  dwarn:1   dfail:0   fail:0   skip:64  time:423s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:518s
fi-bwr-2160      total:289  pass:184  dwarn:0   dfail:0   fail:0   skip:105 time:277s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:508s
fi-byt-j1900     total:289  pass:254  dwarn:1   dfail:0   fail:0   skip:34  time:499s
fi-byt-n2820     total:289  pass:250  dwarn:1   dfail:0   fail:0   skip:38  time:495s
fi-cfl-s         total:289  pass:223  dwarn:34  dfail:0   fail:0   skip:32  time:546s
fi-elk-e7500     total:289  pass:230  dwarn:0   dfail:0   fail:0   skip:59  time:423s
fi-glk-1         total:289  pass:259  dwarn:1   dfail:0   fail:0   skip:29  time:572s
fi-hsw-4770      total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:429s
fi-hsw-4770r     total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:405s
fi-ilk-650       total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:432s
fi-ivb-3520m     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:488s
fi-ivb-3770      total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:466s
fi-kbl-7500u     total:118  pass:100  dwarn:1   dfail:0   fail:0   skip:16 
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:577s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:603s
fi-pnv-d510      total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:549s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:746s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:493s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:473s
fi-snb-2520m     total:289  pass:251  dwarn:0   dfail:0   fail:0   skip:38  time:580s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:1   skip:39  time:415s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_236/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: failure for igt/kms_rotation_crc : Remove flip tests for sprite plane (rev3)

[Patchwork]

== Series Details ==

Series: igt/kms_rotation_crc : Remove flip tests for sprite plane (rev3)
URL   : https://patchwork.freedesktop.org/series/30588/
State : failure

== Summary ==

Test kms_rotation_crc:
        Subgroup sprite-rotation-180-flip:
                fail       -> PASS       (shard-hsw) fdo#102691
Test perf:
        Subgroup blocking:
                pass       -> FAIL       (shard-hsw) fdo#102252
Test gem_exec_store:
        Subgroup pages-render:
                pass       -> FAIL       (shard-hsw)
Test gem_flink_race:
        Subgroup flink_close:
                pass       -> FAIL       (shard-hsw) fdo#102655
Test kms_cursor_legacy:
        Subgroup flip-vs-cursor-toggle:
                pass       -> FAIL       (shard-hsw) fdo#102670

fdo#102691 https://bugs.freedesktop.org/show_bug.cgi?id=102691
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102655 https://bugs.freedesktop.org/show_bug.cgi?id=102655
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670

shard-hsw        total:2317 pass:1244 dwarn:2   dfail:0   fail:14  skip:1057 time:9729s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_236/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx