From 83988f92dcfb2a6bb1819a252dd2218d35d48683 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 3 Jan 2017 09:34:55 +0200 Subject: [PATCH] drm: drm_probe_helper: Handle the initial delayed event with 1s delay Instead of scheduling the work to handle the initial delayed event, use 1s delay. When the delayed event is handled w/o delay - in a similar matter when the poll had been initialized before drm_helper_probe_single_connector_modes() is called - it triggers a race in Optimus setups. Signed-off-by: Peter Ujfalusi --- drivers/gpu/drm/drm_probe_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 98ed110e28ed..f30c14b0a72f 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -146,8 +146,9 @@ void drm_kms_helper_poll_enable_locked(struct drm_device *dev) drm_connector_list_iter_put(&conn_iter); if (dev->mode_config.delayed_event) { + /* Use short (1s) delay to handle the initial delayed event */ poll = true; - delay = 0; + delay = HZ; } if (poll) -- 2.11.0