From 6712f4983ff929f0c985f6972800e9e2ffab6d0a Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 31 Jan 2017 00:21:28 +0200 Subject: [PATCH 3/3] drm: Schedule the output_poll_work with 1s delay if we have delayed event In principle it is the same patch as accepted upstream to fix nouveau/optimus breakage. https://patchwork.kernel.org/patch/9504911/ Signed-off-by: Peter Ujfalusi --- drivers/gpu/drm/drm_probe_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 3dac1eb4a51d..f3b4b0440fd0 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -145,7 +145,7 @@ void drm_kms_helper_poll_enable_locked(struct drm_device *dev) if (dev->mode_config.delayed_event) { DRM_DEV_DEBUG_KMS(dev->dev, "BUG98690: for delayed_event\n"); poll = true; - delay = 0; + delay = HZ; } if (poll) -- 2.11.0