public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] tests/kms_flip: Keep signal helpers enabled after a failed interruptible subtest
@ 2020-05-19 12:59 Imre Deak
  2020-05-19 15:12 ` [igt-dev] ✗ GitLab.Pipeline: warning for " Patchwork
                   ` (5 more replies)
  0 siblings, 6 replies; 14+ messages in thread
From: Imre Deak @ 2020-05-19 12:59 UTC (permalink / raw)
  To: igt-dev; +Cc: Nidhi Gupta

For the duration of all the interruptible subtests the signal helper is
assumed to stay running after each subtest, both in case the subtest
passes or aborts with a failure. So make sure we don't leave the signal
helper suspended in case igt_assert() aborts.

References: https://gitlab.freedesktop.org/drm/intel/issues/1883
Fixes: 60e8be7ccc72 ("tests/kms_flip: Retry test in case of a DP/HDMI link reset")
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Nidhi Gupta <nidhi1.gupta@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 tests/kms_flip.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 46bfc5858..7bf6958af 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1325,10 +1325,15 @@ retry:
 	 * reset event, which the driver signals with a hotplug event.
 	 */
 	if (!state_ok) {
+		bool hotplug_detected;
+
 		igt_suspend_signal_helper();
-		igt_assert(!retried && igt_hotplug_detected(mon, 3));
+		if (!retried)
+			hotplug_detected = igt_hotplug_detected(mon, 3);
 		igt_resume_signal_helper();
 
+		igt_assert(!retried && hotplug_detected);
+
 		igt_debug("Retrying after a hotplug event\n");
 		retried = true;
 		memset(&o->vblank_state, 0, sizeof(o->vblank_state));
-- 
2.23.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

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

end of thread, other threads:[~2020-05-22  8:36 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-19 12:59 [igt-dev] [PATCH i-g-t] tests/kms_flip: Keep signal helpers enabled after a failed interruptible subtest Imre Deak
2020-05-19 15:12 ` [igt-dev] ✗ GitLab.Pipeline: warning for " Patchwork
2020-05-19 15:27 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2020-05-19 22:21 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2020-05-20  7:17   ` Imre Deak
2020-05-20  8:20     ` Vudum, Lakshminarayana
2020-05-20  8:17 ` [igt-dev] ✓ Fi.CI.IGT: success " Patchwork
2020-05-22  8:35   ` Imre Deak
2020-05-21 13:02 ` [igt-dev] [PATCH i-g-t] " Anshuman Gupta
2020-05-21 14:22   ` Shankar, Uma
2020-05-21 14:45     ` Anshuman Gupta
2020-05-21 15:12       ` Imre Deak
2020-05-21 15:35         ` Anshuman Gupta
2020-05-21 14:06 ` Shankar, Uma

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox