Skip to contentSkip to conversation

tests/kms_cursor_legacy: Remove strict vblank checking on 2x-*-vs-cursor tests.

PATCH In review Maarten Lankhorst 3 participants 5 messages Oct 18, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/kms_cursor_legacy: Remove strict vblank checking on 2x-*-vs-cursor tests.

There is no guarantee that on 2 screens the vblanks are in any way synchronized, so it's best to stop checking them, since doing an update involving multiple pipes may incur an arbitrary amount of delay.

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

---
 tests/kms_cursor_legacy.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
tests/kms_cursor_legacy.c +2 -13
index 5720dbef90d3..fc00a0e688f2 100644
@@ -887,7 +887,6 @@ static void two_screens_flip_vs_cursor(igt_display_t *display, int nloops, bool
 	struct drm_mode_cursor arg[2], arg2[2];
 	struct drm_event_vblank vbl;
 	struct igt_fb fb_info, fb2_info, cursor_fb;
-	unsigned vblank_start;
 	enum pipe pipe = find_connected_pipe(display, false);
 	enum pipe pipe2 = find_connected_pipe(display, true);
 	igt_output_t *output, *output2;
@@ -917,20 +916,15 @@ static void two_screens_flip_vs_cursor(igt_display_t *display, int nloops, bool
 
 	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
 
-	vblank_start = get_vblank(display->drm_fd, pipe, DRM_VBLANK_NEXTONMISS);
-	igt_assert_eq(get_vblank(display->drm_fd, pipe, 0), vblank_start);
 	do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg[0]);
 	do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg2[0]);
-	igt_assert_eq(get_vblank(display->drm_fd, pipe, 0), vblank_start);
 
 	while (nloops--) {
-		/* Start with a synchronous query to align with the vblank */
-		vblank_start = get_vblank(display->drm_fd, pipe, DRM_VBLANK_NEXTONMISS);
 		do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg[nloops & 1]);
 
-		if (!modeset)
+		if (!modeset) {
 			flip_nonblocking(display, pipe, false, &fb_info);
-		else {
+		} else {
 			/*
 			 * There are 2 design issues that prevent us from doing
 			 * the test we would like here:
@@ -951,19 +945,14 @@ static void two_screens_flip_vs_cursor(igt_display_t *display, int nloops, bool
 			igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET | DRM_MODE_ATOMIC_NONBLOCK, NULL);
 		}
 
-		igt_assert_eq(get_vblank(display->drm_fd, pipe, 0), vblank_start);
-
 		do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg[nloops & 1]);
 		if (!modeset) {
 			do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg2[nloops & 1]);
 			do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg[nloops & 1]);
 			do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg2[nloops & 1]);
 
-			igt_assert_eq(get_vblank(display->drm_fd, pipe, 0), vblank_start);
-
 			igt_set_timeout(1, "Stuck page flip");
 			igt_ignore_warn(read(display->drm_fd, &vbl, sizeof(vbl)));
-			igt_assert_eq(get_vblank(display->drm_fd, pipe, 0), vblank_start + 1);
 			igt_reset_timeout();
 		} else {
 			do_ioctl(display->drm_fd, DRM_IOCTL_MODE_CURSOR, &arg2[nloops & 1]);
Signature · 6 lines
2.14.1

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

Quoting Maarten Lankhorst (2017-10-18 11:43:25)

Quoted 3 lines

There is no guarantee that on 2 screens the vblanks are in any way synchronized, so it's best to stop checking them, since doing an update involving multiple pipes may incur an arbitrary amount of delay.

Ah, that's a shame. Not much point in asking 2 crtcs to be updated at the same time, if they aren't. (Give or take the lack of genlock, and lack of Ville's tricks to synchronise clocks in sw.) -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

Op 18-10-17 om 12:47 schreef Chris Wilson:

Quoted 8 lines

Quoting Maarten Lankhorst (2017-10-18 11:43:25)

Quoted 3 lines

There is no guarantee that on 2 screens the vblanks are in any way synchronized, so it's best to stop checking them, since doing an update involving multiple pipes may incur an arbitrary amount of delay.

Ah, that's a shame. Not much point in asking 2 crtcs to be updated at the same time, if they aren't. (Give or take the lack of genlock, and lack of Ville's tricks to synchronise clocks in sw.) -Chris

Yeah it's a shame, but testing that we don't wipe out watermarks on the other pipe with a cursor update on one of the pipes is still a good use of the test. :)

2x-cursor-vs-* still counts vblanks, so that part is not completely lost.

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

#3 lore raw

✓ Fi.CI.BAT: success for tests/kms_cursor_legacy: Remove strict vblank checking on 2x-*-vs-cursor tests.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests/kms_cursor_legacy: Remove strict vblank checking on 2x-*-vs-cursor tests.
URL : https://patchwork.freedesktop.org/series/32202/
State : success

== Summary ==

IGT patchset tested on top of latest successful build 9a3f6f59d4c208219f7d3178106bdef628ff68d0 tests/intel-ci: Remove fast-feedback-simulation.testlist

with latest DRM-Tip kernel build CI_DRM_3258
8b18ad103908 drm-tip: 2017y-10m-18d-08h-27m-31s UTC integration manifest

No testlist changes.

Test chamelium:

        Subgroup dp-crc-fast:
                fail       -> PASS       (fi-kbl-7500u) fdo#102514

fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:448s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:450s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:374s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:534s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:264s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:501s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:493s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:492s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:488s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:421s
fi-gdg-551       total:289  pass:177  dwarn:1   dfail:0   fail:2   skip:109 time:254s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:583s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:444s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:424s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:430s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:491s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:461s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:490s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:573s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:477s
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:553s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:455s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:647s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:520s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:490s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:456s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:572s
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_374/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✗ Fi.CI.IGT: failure for tests/kms_cursor_legacy: Remove strict vblank checking on 2x-*-vs-cursor tests.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests/kms_cursor_legacy: Remove strict vblank checking on 2x-*-vs-cursor tests.
URL : https://patchwork.freedesktop.org/series/32202/
State : failure

== Summary ==

Test kms_atomic_transition:

        Subgroup plane-all-transition-nonblocking-fencing:
                pass       -> FAIL       (shard-hsw)
Test kms_setmode:
        Subgroup basic:
                pass       -> FAIL       (shard-hsw) fdo#99912
Test prime_self_import:
        Subgroup export-vs-gem_close-race:
                pass       -> FAIL       (shard-hsw) fdo#102655
Test perf:
        Subgroup polling:
                fail       -> PASS       (shard-hsw) fdo#102252

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

shard-hsw total:2540 pass:1428 dwarn:0 dfail:0 fail:11 skip:1101 time:9266s

== Logs ==

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