Skip to contentSkip to conversation

tests/kms_atomic_transition: Make tests pass

PATCH In review Maarten Lankhorst 3 participants 8 messages Oct 20, 2017 – Oct 24, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/kms_atomic_transition: Make tests pass

kms_atomic_transition was updating already disabled planes and committing them nonblockingly. This results in sporadic -EBUSY failures because planes that are unbound have their own timeline.

The solution is not unbinding already unbound planes, making the test pass. There is also a related kernel bug causing failures in the same way, but that will get fixed soon.

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

---
 tests/kms_atomic_transition.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
tests/kms_atomic_transition.c +6 -3
index 7ddb65cea183..4c295125a8a7 100644
@@ -134,7 +134,8 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
 		int i = plane->index;
 
 		if (!((1 << plane->index) & mask)) {
-			igt_plane_set_fb(plane, NULL);
+			if (plane->values[IGT_PLANE_FB_ID])
+				igt_plane_set_fb(plane, NULL);
 			continue;
 		}
 
@@ -388,11 +389,13 @@ static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool non
 	if (fencing) {
 		int fence_fd = display->pipes[pipe].out_fence_fd;
 
-		igt_assert_neq(fd_completed(fence_fd), nonblocking);
+		if (!nonblocking)
+			igt_assert(fd_completed(fence_fd));
 
 		igt_assert(sync_fence_wait(fence_fd, 30000) == 0);
 	} else {
-		igt_assert_neq(fd_completed(display->drm_fd), nonblocking);
+		if (!nonblocking)
+			igt_assert(fd_completed(display->drm_fd));
 
 		drmHandleEvent(display->drm_fd, &drm_events);
 	}
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for tests/kms_atomic_transition: Make tests pass

== Series Details ==

== Series Details ==

Series: tests/kms_atomic_transition: Make tests pass
URL : https://patchwork.freedesktop.org/series/32361/
State : success

== Summary ==

IGT patchset tested on top of latest successful build 9ba736aecc2a3cb34a2aeec8d417f66390e0c82b tools/intel_vbt_decode: abstract child devices printing more

with latest DRM-Tip kernel build CI_DRM_3269
75b85b0dce2f drm-tip: 2017y-10m-20d-10h-07m-16s UTC integration manifest

No testlist changes.

Test kms_cursor_legacy:

        Subgroup basic-busy-flip-before-cursor-legacy:
                pass       -> FAIL       (fi-gdg-551) fdo#102618
Test kms_pipe_crc_basic:
        Subgroup read-crc-pipe-b-frame-sequence:
                incomplete -> PASS       (fi-skl-6700hq) fdo#102035
Test prime_vgem:
        Subgroup basic-fence-flip:
                dmesg-warn -> PASS       (fi-kbl-7567u) fdo#103165 +1

fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fdo#102035 https://bugs.freedesktop.org/show_bug.cgi?id=102035
fdo#103165 https://bugs.freedesktop.org/show_bug.cgi?id=103165

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:441s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:458s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:373s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:522s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:265s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:500s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:501s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:502s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:486s
fi-cfl-s         total:289  pass:253  dwarn:4   dfail:0   fail:0   skip:32  time:558s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:416s
fi-gdg-551       total:289  pass:177  dwarn:1   dfail:0   fail:2   skip:109 time:258s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:578s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:448s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:421s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:433s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:499s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:465s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:492s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:574s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:476s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:582s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:542s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:451s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:646s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:525s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:513s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:458s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:568s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:423s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_395/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.IGT: success for tests/kms_atomic_transition: Make tests pass

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests/kms_atomic_transition: Make tests pass
URL : https://patchwork.freedesktop.org/series/32361/
State : success

== Summary ==

Test kms_setmode:

        Subgroup basic:
                pass       -> FAIL       (shard-hsw) fdo#99912
Test kms_flip:
        Subgroup blt-wf_vblank-vs-dpms:
                dmesg-warn -> PASS       (shard-hsw) fdo#102614
        Subgroup plain-flip-fb-recreate:
                pass       -> FAIL       (shard-hsw) fdo#102504
Test kms_busy:
        Subgroup extended-modeset-hang-newfb-with-reset-render-C:
                pass       -> DMESG-WARN (shard-hsw) fdo#102249
        Subgroup extended-modeset-hang-newfb-with-reset-render-B:
                dmesg-warn -> PASS       (shard-hsw) fdo#103038
Test drv_module_reload:
        Subgroup basic-reload-inject:
                dmesg-warn -> PASS       (shard-hsw) fdo#102707
Test kms_plane:
        Subgroup plane-position-hole-pipe-A-planes:
                skip       -> PASS       (shard-hsw)
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-primscrn-cur-indfb-move:
                skip       -> PASS       (shard-hsw)
        Subgroup fbc-1p-offscren-pri-indfb-draw-mmap-cpu:
                skip       -> PASS       (shard-hsw)

fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#102504 https://bugs.freedesktop.org/show_bug.cgi?id=102504
fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#103038 https://bugs.freedesktop.org/show_bug.cgi?id=103038
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707

shard-hsw total:2540 pass:1427 dwarn:2 dfail:0 fail:10 skip:1101 time:9234s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_395/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Maarten Lankhorst

On Fri, Oct 20, 2017 at 03:24:15PM +0200, Maarten Lankhorst wrote:

Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_atomic_transition: Make tests pass

You have an excellent explanation of what this patch does in the long description, and yet this short description says nothing of value.

Signature · 1 line
Petri Latvala
Quoted 51 lines

kms_atomic_transition was updating already disabled planes and committing them nonblockingly. This results in sporadic -EBUSY failures because planes that are unbound have their own timeline.

The solution is not unbinding already unbound planes, making the test pass. There is also a related kernel bug causing failures in the same way, but that will get fixed soon.

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

---
 tests/kms_atomic_transition.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
tests/kms_atomic_transition.c +6 -3
index 7ddb65cea183..4c295125a8a7 100644
@@ -134,7 +134,8 @@ wm_setup_plane(igt_display_t *display, enum pipe pipe,
 		int i = plane->index;
 
 		if (!((1 << plane->index) & mask)) {
-			igt_plane_set_fb(plane, NULL);
+			if (plane->values[IGT_PLANE_FB_ID])
+				igt_plane_set_fb(plane, NULL);
 			continue;
 		}
 
@@ -388,11 +389,13 @@ static void wait_for_transition(igt_display_t *display, enum pipe pipe, bool non
 	if (fencing) {
 		int fence_fd = display->pipes[pipe].out_fence_fd;
 
-		igt_assert_neq(fd_completed(fence_fd), nonblocking);
+		if (!nonblocking)
+			igt_assert(fd_completed(fence_fd));
 
 		igt_assert(sync_fence_wait(fence_fd, 30000) == 0);
 	} else {
-		igt_assert_neq(fd_completed(display->drm_fd), nonblocking);
+		if (!nonblocking)
+			igt_assert(fd_completed(display->drm_fd));
 
 		drmHandleEvent(display->drm_fd, &drm_events);
 	}
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Op 23-10-17 om 11:35 schreef Petri Latvala:

Quoted 12 lines · Maarten Lankhorst

Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_atomic_transition: Make tests pass

You have an excellent explanation of what this patch does in the long description, and yet this short description says nothing of value.

Is this patch good with subject: 'tests/kms_atomic_transition: Do not update unbound planes'?

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by
#5 lore raw
Quoted 8 lines · Maarten Lankhorst

Op 23-10-17 om 11:35 schreef Petri Latvala:

Quoted 7 lines · Maarten Lankhorst

Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_atomic_transition: Make tests pass

Quoted 7 lines
Quoted 5 lines

You have an excellent explanation of what this patch does in the long description, and yet this short description says nothing of value.

Is this patch good with subject: 'tests/kms_atomic_transition: Do not update unbound planes'?

LGTM.

Explain the change of making fd_completed() call conditional too in the commit message and

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

Op 24-10-17 om 14:10 schreef Petri Latvala:

Quoted 13 lines · Maarten Lankhorst
Quoted 12 lines

Op 23-10-17 om 11:35 schreef Petri Latvala:

Quoted 11 lines · Maarten Lankhorst

Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_atomic_transition: Make tests pass

You have an excellent explanation of what this patch does in the long description, and yet this short description says nothing of value.

Quoted 8 lines
Quoted 2 lines

Is this patch good with subject: 'tests/kms_atomic_transition: Do not update unbound planes'?

LGTM.

Explain the change of making fd_completed() call conditional too in the commit message and

Thanks, pushed. :)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

✗ Fi.CI.BAT: failure for tests/kms_atomic_transition: Make tests pass

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests/kms_atomic_transition: Make tests pass
URL : https://patchwork.freedesktop.org/series/32361/
State : failure

== Summary ==

Series 32361 revision 1 was fully merged or fully failed: no git log

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_395/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx