drm/probe-helper: Cancel previous job before starting new one
authorDom Cobley <popcornmix@gmail.com>
Fri, 27 Jan 2023 15:40:52 +0000 (16:40 +0100)
committerMaxime Ripard <maxime@cerno.tech>
Mon, 27 Feb 2023 15:19:14 +0000 (16:19 +0100)
commita8e47884f1906cd7440fafa056adc8817568e73e
tree97a41a7acf6dc49154713733f2a34660f76461ca
parent67b7836d4458790f1261e31fe0ce3250989784f0
drm/probe-helper: Cancel previous job before starting new one

Currently we schedule a call to output_poll_execute from
drm_kms_helper_poll_enable for 10s in future. Later we try to replace
that in drm_helper_probe_single_connector_modes with a 0s schedule with
delayed_event set.

But as there is already a job in the queue this fails, and the immediate
job we wanted with delayed_event set doesn't occur until 10s later.

And that call acts as if connector state has changed, reprobing modes.
This has a side effect of waking up a display that has been blanked.

Make sure we cancel the old job before submitting the immediate one.

Fixes: 162b6a57ac50 ("drm/probe-helper: don't lose hotplug event")
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
[Maxime: Switched to mod_delayed_work]
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20230127154052.452524-1-maxime@cerno.tech
drivers/gpu/drm/drm_probe_helper.c