[PATCH v3 1/7] drm/poll-helper: merge drm_kms_helper_poll_disable() and _fini()
Dmitry Baryshkov
dmitry.baryshkov at linaro.org
Wed Nov 2 18:06:59 UTC 2022
Merge drm_kms_helper_poll_disable() and drm_kms_helper_poll_fini() code
into a common helper function.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
---
drivers/gpu/drm/drm_probe_helper.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 69b0b2b9cc1c..f97fda3b1d34 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -803,6 +803,17 @@ bool drm_kms_helper_is_poll_worker(void)
}
EXPORT_SYMBOL(drm_kms_helper_is_poll_worker);
+static void drm_kms_helper_poll_disable_fini(struct drm_device *dev, bool fini)
+{
+ if (!dev->mode_config.poll_enabled)
+ return;
+
+ if (fini)
+ dev->mode_config.poll_enabled = false;
+
+ cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
+}
+
/**
* drm_kms_helper_poll_disable - disable output polling
* @dev: drm_device
@@ -819,9 +830,7 @@ EXPORT_SYMBOL(drm_kms_helper_is_poll_worker);
*/
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);
+ drm_kms_helper_poll_disable_fini(dev, false);
}
EXPORT_SYMBOL(drm_kms_helper_poll_disable);
@@ -859,11 +868,7 @@ EXPORT_SYMBOL(drm_kms_helper_poll_init);
*/
void drm_kms_helper_poll_fini(struct drm_device *dev)
{
- if (!dev->mode_config.poll_enabled)
- return;
-
- dev->mode_config.poll_enabled = false;
- cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
+ drm_kms_helper_poll_disable_fini(dev, true);
}
EXPORT_SYMBOL(drm_kms_helper_poll_fini);
--
2.35.1
More information about the dri-devel
mailing list