Commit f62268e1 authored by Imre Deak's avatar Imre Deak

tests/kms_flip: Keep signal helpers enabled after a failed interruptible subtest

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: intel#1883
Fixes: 60e8be7c ("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's avatarImre Deak <imre.deak@intel.com>
Reviewed-by: Uma Shankar's avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: Anshuman Gupta's avatarAnshuman Gupta <anshuman.gupta@intel.com>
parent f37cd374
Pipeline #150126 passed with stages
in 10 minutes and 43 seconds
......@@ -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));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment