[PATCH] poll-suspend

Chris Wilson chris at chris-wilson.co.uk
Thu Feb 15 13:25:36 UTC 2018


---
 drivers/gpu/drm/drm_probe_helper.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 2d1643bdae78..36c68b63f350 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -229,7 +229,7 @@ void drm_kms_helper_poll_enable(struct drm_device *dev)
 	struct drm_connector_list_iter conn_iter;
 	unsigned long delay = DRM_OUTPUT_POLL_PERIOD;
 
-	if (!dev->mode_config.poll_enabled || !drm_kms_helper_poll)
+	if (!drm_kms_helper_poll)
 		return;
 
 	drm_connector_list_iter_begin(dev, &conn_iter);
@@ -255,6 +255,7 @@ void drm_kms_helper_poll_enable(struct drm_device *dev)
 		delay = HZ;
 	}
 
+	dev->mode_config.poll_enabled = true;
 	if (poll)
 		schedule_delayed_work(&dev->mode_config.output_poll_work, delay);
 }
@@ -672,6 +673,7 @@ void drm_kms_helper_poll_disable(struct drm_device *dev)
 	if (!dev->mode_config.poll_enabled)
 		return;
 	cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
+	dev->mode_config.poll_enabled = false;
 }
 EXPORT_SYMBOL(drm_kms_helper_poll_disable);
 
@@ -697,8 +699,6 @@ EXPORT_SYMBOL(drm_kms_helper_poll_disable);
 void drm_kms_helper_poll_init(struct drm_device *dev)
 {
 	INIT_DELAYED_WORK(&dev->mode_config.output_poll_work, output_poll_execute);
-	dev->mode_config.poll_enabled = true;
-
 	drm_kms_helper_poll_enable(dev);
 }
 EXPORT_SYMBOL(drm_kms_helper_poll_init);
-- 
2.16.1



More information about the Intel-gfx-trybot mailing list