From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id B915A6E02C for ; Tue, 19 May 2020 12:59:59 +0000 (UTC) From: Imre Deak Date: Tue, 19 May 2020 15:59:56 +0300 Message-Id: <20200519125956.13206-1-imre.deak@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] tests/kms_flip: Keep signal helpers enabled after a failed interruptible subtest List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Nidhi Gupta List-ID: 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 Cc: Nidhi Gupta Signed-off-by: Imre Deak --- 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