All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH igt 1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait()
@ 2017-10-10 17:19 Chris Wilson
  2017-10-10 17:19 ` [PATCH igt 2/2] igt/syncobj_wait: Close the sw_sync timeline after the test Chris Wilson
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2017-10-10 17:19 UTC (permalink / raw)
  To: intel-gfx; +Cc: Dave Airlie

Remove the bare igt_ioctl(SYNCOBJ_WAIT) in favour of __syncobj_wait()
for tidier error reporting.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Dave Airlie <airlied@redhat.com>
---
 tests/syncobj_wait.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/syncobj_wait.c b/tests/syncobj_wait.c
index 385d8cd8..78ed1fc5 100644
--- a/tests/syncobj_wait.c
+++ b/tests/syncobj_wait.c
@@ -713,7 +713,7 @@ test_wait_interrupted(int fd, uint32_t test_flags)
 {
 	struct local_syncobj_wait wait = { 0 };
 	uint32_t syncobj = syncobj_create(fd, 0);
-	int ret, timeline;
+	int timeline;
 
 	wait.handles = to_user_pointer(&syncobj);
 	wait.count_handles = 1;
@@ -721,20 +721,16 @@ test_wait_interrupted(int fd, uint32_t test_flags)
 
 	if (test_flags & WAIT_FOR_SUBMIT) {
 		wait.timeout_nsec = short_timeout();
-		igt_while_interruptible(true) {
-			ret = igt_ioctl(fd, LOCAL_IOCTL_SYNCOBJ_WAIT, &wait);
-			igt_assert(ret == -1 && errno == ETIME);
-		}
+		igt_while_interruptible(true)
+			igt_assert_eq(__syncobj_wait(fd, &wait), -ETIME);
 	}
 
 	timeline = syncobj_attach_sw_sync(fd, syncobj);
 	close(timeline);
 
 	wait.timeout_nsec = short_timeout();
-	igt_while_interruptible(true) {
-		ret = igt_ioctl(fd, LOCAL_IOCTL_SYNCOBJ_WAIT, &wait);
-		igt_assert(ret == -1 && errno == ETIME);
-	}
+	igt_while_interruptible(true)
+		igt_assert_eq(__syncobj_wait(fd, &wait), -ETIME);
 
 	syncobj_destroy(fd, syncobj);
 }
-- 
2.15.0.rc0

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH igt 2/2] igt/syncobj_wait: Close the sw_sync timeline after the test
  2017-10-10 17:19 [PATCH igt 1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait() Chris Wilson
@ 2017-10-10 17:19 ` Chris Wilson
  2017-10-10 20:03 ` ✓ Fi.CI.BAT: success for series starting with [1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait() Patchwork
  2017-10-11  4:55 ` ✓ Fi.CI.IGT: " Patchwork
  2 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2017-10-10 17:19 UTC (permalink / raw)
  To: intel-gfx; +Cc: Dave

Closing the sw_sync timeline now signals any remaining fences upon it;
but test_wait_interrupted requires the fence to be busy for the
__syncobj_wait() not to immediately return with -ETIME (and so be
interrupted instead).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103187
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Dave Airlie <airlied@redhat.com
---
 tests/syncobj_wait.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/syncobj_wait.c b/tests/syncobj_wait.c
index 78ed1fc5..5fd37808 100644
--- a/tests/syncobj_wait.c
+++ b/tests/syncobj_wait.c
@@ -726,13 +726,13 @@ test_wait_interrupted(int fd, uint32_t test_flags)
 	}
 
 	timeline = syncobj_attach_sw_sync(fd, syncobj);
-	close(timeline);
 
 	wait.timeout_nsec = short_timeout();
 	igt_while_interruptible(true)
 		igt_assert_eq(__syncobj_wait(fd, &wait), -ETIME);
 
 	syncobj_destroy(fd, syncobj);
+	close(timeline);
 }
 
 static bool
-- 
2.15.0.rc0

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* ✓ Fi.CI.BAT: success for series starting with [1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait()
  2017-10-10 17:19 [PATCH igt 1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait() Chris Wilson
  2017-10-10 17:19 ` [PATCH igt 2/2] igt/syncobj_wait: Close the sw_sync timeline after the test Chris Wilson
@ 2017-10-10 20:03 ` Patchwork
  2017-10-11  4:55 ` ✓ Fi.CI.IGT: " Patchwork
  2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2017-10-10 20:03 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait()
URL   : https://patchwork.freedesktop.org/series/31672/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
d7c88290ab6a8393dc341b30c7fb5e27d2952901 syncobj: Add a test for SYNCOBJ_CREATE_SIGNALED

with latest DRM-Tip kernel build CI_DRM_3207
d82f454de90a drm-tip: 2017y-10m-10d-18h-40m-34s UTC integration manifest

No testlist changes.

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                pass       -> DMESG-WARN (fi-byt-j1900) fdo#101705 +1

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

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:459s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:471s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:390s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:575s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:288s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:525s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:517s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:544s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:529s
fi-cfl-s         total:289  pass:253  dwarn:4   dfail:0   fail:0   skip:32  time:566s
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:634s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:433s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:603s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:443s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:427s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:464s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:502s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:478s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:506s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:583s
fi-kbl-7567u     total:289  pass:265  dwarn:4   dfail:0   fail:0   skip:20  time:497s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:593s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:659s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:473s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:653s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:538s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:509s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:474s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:578s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:430s

== Logs ==

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* ✓ Fi.CI.IGT: success for series starting with [1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait()
  2017-10-10 17:19 [PATCH igt 1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait() Chris Wilson
  2017-10-10 17:19 ` [PATCH igt 2/2] igt/syncobj_wait: Close the sw_sync timeline after the test Chris Wilson
  2017-10-10 20:03 ` ✓ Fi.CI.BAT: success for series starting with [1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait() Patchwork
@ 2017-10-11  4:55 ` Patchwork
  2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2017-10-11  4:55 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait()
URL   : https://patchwork.freedesktop.org/series/31672/
State : success

== Summary ==

Test syncobj_wait:
        Subgroup wait-any-interrupted:
                fail       -> PASS       (shard-hsw) fdo#103187 +1
Test drv_module_reload:
        Subgroup basic-reload:
                pass       -> DMESG-WARN (shard-hsw) fdo#102707
Test gem_eio:
        Subgroup wait:
                pass       -> DMESG-WARN (shard-hsw) fdo#102886 +3
Test kms_flip:
        Subgroup flip-vs-absolute-wf_vblank-interruptible:
                fail       -> PASS       (shard-hsw) fdo#100368
Test kms_vblank:
        Subgroup accuracy-idle:
                pass       -> FAIL       (shard-hsw) fdo#102583
Test gem_flink_race:
        Subgroup flink_close:
                pass       -> FAIL       (shard-hsw) fdo#102655

fdo#103187 https://bugs.freedesktop.org/show_bug.cgi?id=103187
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#102886 https://bugs.freedesktop.org/show_bug.cgi?id=102886
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102583 https://bugs.freedesktop.org/show_bug.cgi?id=102583
fdo#102655 https://bugs.freedesktop.org/show_bug.cgi?id=102655

shard-hsw        total:2552 pass:1430 dwarn:6   dfail:0   fail:13  skip:1103 time:9676s

== Logs ==

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-10-11  4:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-10 17:19 [PATCH igt 1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait() Chris Wilson
2017-10-10 17:19 ` [PATCH igt 2/2] igt/syncobj_wait: Close the sw_sync timeline after the test Chris Wilson
2017-10-10 20:03 ` ✓ Fi.CI.BAT: success for series starting with [1/2] tests/syncobj_wait: Replace open-coded calls to __syncobj_wait() Patchwork
2017-10-11  4:55 ` ✓ Fi.CI.IGT: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.