[igt-dev] [PATCH i-g-t] tests/kms_flip: Keep signal helpers enabled after a failed interruptible subtest

[Shankar, Uma]

> -----Original Message-----
> From: Deak, Imre <imre.deak at intel.com>
> Sent: Tuesday, May 19, 2020 6:30 PM
> To: igt-dev at lists.freedesktop.org
> Cc: Shankar, Uma <uma.shankar at intel.com>; Gupta, Nidhi1
> <nidhi1.gupta at intel.com>
> Subject: [PATCH i-g-t] 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.

This looks good, yeah we missed it earlier.
Reviewed-by: Uma Shankar <uma.shankar at intel.com>

> 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 at intel.com>
> Cc: Nidhi Gupta <nidhi1.gupta at intel.com>
> Signed-off-by: Imre Deak <imre.deak at 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