Re: [PATCH v3 1/2] drm/probe_helper: extract two helper functions

[Neil Armstrong]

On 24/01/2023 11:45, Dmitry Baryshkov wrote:

Extract drm_kms_helper_enable_hpd() and drm_kms_helper_disable_hpd(),
two helpers that enable and disable HPD handling on all device's
connectors.

Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
  drivers/gpu/drm/drm_probe_helper.c | 68 ++++++++++++++++++------------
  1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/drivers/gpu/drm/drm_probe_helper.c 
b/drivers/gpu/drm/drm_probe_helper.c
index 95aeeed33cf5..ab787d71fa66 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -222,6 +222,45 @@ drm_connector_mode_valid(struct drm_connector *connector,
        return ret;
  }

+static void drm_kms_helper_disable_hpd(struct drm_device *dev)

+{
+       struct drm_connector *connector;
+       struct drm_connector_list_iter conn_iter;
+
+       drm_connector_list_iter_begin(dev, &conn_iter);
+       drm_for_each_connector_iter(connector, &conn_iter) {
+               const struct drm_connector_helper_funcs *funcs =
+                       connector->helper_private;
+
+               if (funcs && funcs->disable_hpd)
+                       funcs->disable_hpd(connector);
+       }
+       drm_connector_list_iter_end(&conn_iter);
+}
+
+static bool drm_kms_helper_enable_hpd(struct drm_device *dev)
+{
+       bool poll = false;
+       struct drm_connector *connector;
+       struct drm_connector_list_iter conn_iter;
+
+       drm_connector_list_iter_begin(dev, &conn_iter);
+       drm_for_each_connector_iter(connector, &conn_iter) {
+               const struct drm_connector_helper_funcs *funcs =
+                       connector->helper_private;
+
+               if (funcs && funcs->enable_hpd)
+                       funcs->enable_hpd(connector);
+
+               if (connector->polled & (DRM_CONNECTOR_POLL_CONNECT |
+                                        DRM_CONNECTOR_POLL_DISCONNECT))
+                       poll = true;
+       }
+       drm_connector_list_iter_end(&conn_iter);
+
+       return poll;
+}
+
  #define DRM_OUTPUT_POLL_PERIOD (10*HZ)
  /**
   * drm_kms_helper_poll_enable - re-enable output polling.
@@ -241,26 +280,12 @@ drm_connector_mode_valid(struct drm_connector *connector,
  void drm_kms_helper_poll_enable(struct drm_device *dev)
  {
        bool poll = false;
-       struct drm_connector *connector;
-       struct drm_connector_list_iter conn_iter;
        unsigned long delay = DRM_OUTPUT_POLL_PERIOD;

if (!dev->mode_config.poll_enabled || !drm_kms_helper_poll)

                return;

- drm_connector_list_iter_begin(dev, &conn_iter);

-       drm_for_each_connector_iter(connector, &conn_iter) {
-               const struct drm_connector_helper_funcs *funcs =
-                       connector->helper_private;
-
-               if (funcs && funcs->enable_hpd)
-                       funcs->enable_hpd(connector);
-
-               if (connector->polled & (DRM_CONNECTOR_POLL_CONNECT |
-                                        DRM_CONNECTOR_POLL_DISCONNECT))
-                       poll = true;
-       }
-       drm_connector_list_iter_end(&conn_iter);
+       poll = drm_kms_helper_enable_hpd(dev);

if (dev->mode_config.delayed_event) {

                /*
@@ -810,24 +835,13 @@ EXPORT_SYMBOL(drm_kms_helper_is_poll_worker);

static void drm_kms_helper_poll_disable_fini(struct drm_device *dev, bool fini)

  {
-       struct drm_connector *connector;
-       struct drm_connector_list_iter conn_iter;
-
        if (!dev->mode_config.poll_enabled)
                return;

if (fini)

                dev->mode_config.poll_enabled = false;

- drm_connector_list_iter_begin(dev, &conn_iter);

-       drm_for_each_connector_iter(connector, &conn_iter) {
-               const struct drm_connector_helper_funcs *funcs =
-                       connector->helper_private;
-
-               if (funcs && funcs->disable_hpd)
-                       funcs->disable_hpd(connector);
-       }
-       drm_connector_list_iter_end(&conn_iter);
+       drm_kms_helper_disable_hpd(dev);

cancel_delayed_work_sync(&dev->mode_config.output_poll_work);

  }

Reviewed-by: Neil Armstrong <neil.armstr...@linaro.org>