* [PATCH] drm/probe-helper: Cancel previous job before starting new one
@ 2023-01-27 15:40 Maxime Ripard
2023-02-27 15:23 ` (subset) " Maxime Ripard
0 siblings, 1 reply; 2+ messages in thread
From: Maxime Ripard @ 2023-01-27 15:40 UTC (permalink / raw)
To: Daniel Vetter, David Airlie, Maarten Lankhorst,
Thomas Zimmermann, Maxime Ripard
Cc: Dom Cobley, dri-devel
From: Dom Cobley <popcornmix@gmail.com>
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")
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/drm_probe_helper.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 8127be134c39..db954adb446a 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -589,9 +589,11 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
* disable itself again.
*/
dev->mode_config.delayed_event = true;
- if (dev->mode_config.poll_enabled)
+ if (dev->mode_config.poll_enabled) {
+ cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
schedule_delayed_work(&dev->mode_config.output_poll_work,
0);
+ }
}
/* Re-enable polling in case the global poll config changed. */
--
2.39.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: (subset) [PATCH] drm/probe-helper: Cancel previous job before starting new one
2023-01-27 15:40 [PATCH] drm/probe-helper: Cancel previous job before starting new one Maxime Ripard
@ 2023-02-27 15:23 ` Maxime Ripard
0 siblings, 0 replies; 2+ messages in thread
From: Maxime Ripard @ 2023-02-27 15:23 UTC (permalink / raw)
To: Daniel Vetter, David Airlie, Maarten Lankhorst,
Thomas Zimmermann, Maxime Ripard
Cc: Dom Cobley, dri-devel
On Fri, 27 Jan 2023 16:40:52 +0100, Maxime Ripard wrote:
> 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.
>
> [...]
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-27 15:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-27 15:40 [PATCH] drm/probe-helper: Cancel previous job before starting new one Maxime Ripard
2023-02-27 15:23 ` (subset) " Maxime Ripard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.