drm/omap: Merge HPD enable operation with HPD callback registration

The omap_dss_device .enable_hpd() and .disable_hpd() are used to enable
and disable hot-plug detection at omapdrm probe and remove time. This is
required to avoid reporting hot-plug detection events before the DRM
infrastructure is ready to accept them, as that could result in crashes
or other malfunction.

Hot-plug event reporting is conditioned by both HPD being enabled
through the .enable_hpd() operation and by the HPD callback being
registered though the .register_hpd_cb() operation. We thus don't need a
separate enable operation if we can guarantee that callbacks won't be
registered too early.

HPD callbacks are registered at connector initialization time, which is
too early to start reporting HPD events. There's however nothing
blocking a move of callback registration to a later time when the
omapdrm driver calls the HPD enable operations. Do so, and remove the
HPD enable operation completely from omap_dss_device drivers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 27 insertions, 7 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index cd33995b0b1a..e77427d81eb9 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -30,6 +30,7 @@
 struct omap_connector {
         struct drm_connector base;
         struct omap_dss_device *dssdev;
+        struct omap_dss_device *hpd;
         bool hdmi_mode;
 };
 
@@ -50,6 +51,25 @@ static void omap_connector_hpd_cb(void *cb_data,
                 drm_kms_helper_hotplug_event(dev);
 }
 
+void omap_connector_enable_hpd(struct drm_connector *connector)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *hpd = omap_connector->hpd;
+
+        if (hpd)
+                hpd->ops->register_hpd_cb(hpd, omap_connector_hpd_cb,
+                                          omap_connector);
+}
+
+void omap_connector_disable_hpd(struct drm_connector *connector)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *hpd = omap_connector->hpd;
+
+        if (hpd)
+                hpd->ops->unregister_hpd_cb(hpd);
+}
+
 bool omap_connector_get_hdmi_mode(struct drm_connector *connector)
 {
         struct omap_connector *omap_connector = to_omap_connector(connector);
@@ -109,14 +129,15 @@ static enum drm_connector_status omap_connector_detect(
 static void omap_connector_destroy(struct drm_connector *connector)
 {
         struct omap_connector *omap_connector = to_omap_connector(connector);
-        struct omap_dss_device *dssdev;
 
         DBG("%s", omap_connector->dssdev->name);
 
-        if (connector->polled == DRM_CONNECTOR_POLL_HPD) {
-                dssdev = omap_connector_find_device(connector,
-                                                    OMAP_DSS_DEVICE_OP_HPD);
-                dssdev->ops->unregister_hpd_cb(dssdev);
+        if (omap_connector->hpd) {
+                struct omap_dss_device *hpd = omap_connector->hpd;
+
+                hpd->ops->unregister_hpd_cb(hpd);
+                omapdss_device_put(hpd);
+                omap_connector->hpd = NULL;
         }
 
         drm_connector_unregister(connector);
@@ -298,8 +319,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
          */
         dssdev = omap_connector_find_device(connector, OMAP_DSS_DEVICE_OP_HPD);
         if (dssdev) {
-                dssdev->ops->register_hpd_cb(dssdev, omap_connector_hpd_cb,
-                                             omap_connector);
+                omap_connector->hpd = omapdss_device_get(dssdev);
                 connector->polled = DRM_CONNECTOR_POLL_HPD;
         } else {
                 dssdev = omap_connector_find_device(connector,