diff options
| author | Imre Deak <imre.deak@intel.com> | 2020-05-19 15:38:59 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2020-05-22 11:29:39 +0300 |
| commit | f62268e16b3a243bd5c5df3d66b4f0b3d9c78891 (patch) | |
| tree | 91598bab79eebd7eab5988e45662c5d4830892e7 /tests/kms_flip.c | |
| parent | f37cd37470612616f65914bca35497ca13aeb11a (diff) | |
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: 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>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Diffstat (limited to 'tests/kms_flip.c')
| -rwxr-xr-x | tests/kms_flip.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 46bfc585..7bf6958a 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)); |