Commit 78b991cc authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Neil Armstrong
Browse files

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221102180705.459294-2-dmitry.baryshkov@linaro.org
parent b357e7ac

drivers/gpu/drm/drm_probe_helper.c

+13 −8
Original line number Diff line number Diff line
@@ -802,6 +802,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
@@ -818,9 +829,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);
@@ -858,11 +867,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);