Skip to content

Commit 78b991c

Browse files
lumagsuperna9999
authored andcommitted
drm/poll-helper: merge drm_kms_helper_poll_disable() and _fini()
Merge drm_kms_helper_poll_disable() and drm_kms_helper_poll_fini() code into a common helper function. Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Tomi Valkeinen <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent b357e7a commit 78b991c

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

drivers/gpu/drm/drm_probe_helper.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,17 @@ bool drm_kms_helper_is_poll_worker(void)
802802
}
803803
EXPORT_SYMBOL(drm_kms_helper_is_poll_worker);
804804

805+
static void drm_kms_helper_poll_disable_fini(struct drm_device *dev, bool fini)
806+
{
807+
if (!dev->mode_config.poll_enabled)
808+
return;
809+
810+
if (fini)
811+
dev->mode_config.poll_enabled = false;
812+
813+
cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
814+
}
815+
805816
/**
806817
* drm_kms_helper_poll_disable - disable output polling
807818
* @dev: drm_device
@@ -818,9 +829,7 @@ EXPORT_SYMBOL(drm_kms_helper_is_poll_worker);
818829
*/
819830
void drm_kms_helper_poll_disable(struct drm_device *dev)
820831
{
821-
if (!dev->mode_config.poll_enabled)
822-
return;
823-
cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
832+
drm_kms_helper_poll_disable_fini(dev, false);
824833
}
825834
EXPORT_SYMBOL(drm_kms_helper_poll_disable);
826835

@@ -858,11 +867,7 @@ EXPORT_SYMBOL(drm_kms_helper_poll_init);
858867
*/
859868
void drm_kms_helper_poll_fini(struct drm_device *dev)
860869
{
861-
if (!dev->mode_config.poll_enabled)
862-
return;
863-
864-
dev->mode_config.poll_enabled = false;
865-
cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
870+
drm_kms_helper_poll_disable_fini(dev, true);
866871
}
867872
EXPORT_SYMBOL(drm_kms_helper_poll_fini);
868873

0 commit comments

Comments
 (0)