drm: Add HPD state to drm_connector_oob_hotplug_event()

In some implementations, such as the Qualcomm platforms, the display
driver has no way to query the current HPD state and as such it's
impossible to distinguish between disconnect and attention events.

Add a parameter to drm_connector_oob_hotplug_event() to pass the HPD
state.

Also push the test for unchanged state in the displayport altmode driver
into the i915 driver, to allow other drivers to act upon each update.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20231009174048.2695981-2-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231009174048.2695981-2-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 9d4c7b0c5c05988d5e95f0d6e82223ec2f47b24b..c3725086f41325afd6dd805a14f12dc9c9755a19 100644 (file)
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -3060,6 +3060,7 @@ struct drm_connector *drm_connector_find_by_fwnode(struct fwnode_handle *fwnode)
 /**
  * drm_connector_oob_hotplug_event - Report out-of-band hotplug event to connector
  * @connector_fwnode: fwnode_handle to report the event on
+ * @status: hot plug detect logical state
  *
  * On some hardware a hotplug event notification may come from outside the display
  * driver / device. An example of this is some USB Type-C setups where the hardware
@@ -3069,7 +3070,8 @@ struct drm_connector *drm_connector_find_by_fwnode(struct fwnode_handle *fwnode)
  * This function can be used to report these out-of-band events after obtaining
  * a drm_connector reference through calling drm_connector_find_by_fwnode().
  */
-void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode)
+void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode,
+                                    enum drm_connector_status status)
 {
        struct drm_connector *connector;
 
@@ -3078,7 +3080,7 @@ void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode)
                return;
 
        if (connector->funcs->oob_hotplug_event)
-               connector->funcs->oob_hotplug_event(connector);
+               connector->funcs->oob_hotplug_event(connector, status);
 
        drm_connector_put(connector);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 53e5c33e08c3bb9e9d29a3eac798a6a2df4a373e..ccfe27630fb661ae7ffb3ad7827647941cb92ca9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -175,6 +175,9 @@ struct intel_hotplug {
        /* Whether or not to count short HPD IRQs in HPD storms */
        u8 hpd_short_storm_enabled;
 
+       /* Last state reported by oob_hotplug_event for each encoder */
+       unsigned long oob_hotplug_last_state;
+
        /*
         * if we get a HPD irq from DP and a HPD irq from non-DP
         * the non-DP HPD could block the workqueue on a mode config

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 65d80eef473b1c93b0666da608f21d23d422bcde..9c174ff93398c2ffdaa53c40a41ed1bd92fa53c6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5723,15 +5723,26 @@ static int intel_dp_connector_atomic_check(struct drm_connector *conn,
        return intel_modeset_synced_crtcs(state, conn);
 }
 
-static void intel_dp_oob_hotplug_event(struct drm_connector *connector)
+static void intel_dp_oob_hotplug_event(struct drm_connector *connector,
+                                      enum drm_connector_status hpd_state)
 {
        struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
        struct drm_i915_private *i915 = to_i915(connector->dev);
+       bool hpd_high = hpd_state == connector_status_connected;
+       unsigned int hpd_pin = encoder->hpd_pin;
+       bool need_work = false;
 
        spin_lock_irq(&i915->irq_lock);
-       i915->display.hotplug.event_bits |= BIT(encoder->hpd_pin);
+       if (hpd_high != test_bit(hpd_pin, &i915->display.hotplug.oob_hotplug_last_state)) {
+               i915->display.hotplug.event_bits |= BIT(hpd_pin);
+
+               __assign_bit(hpd_pin, &i915->display.hotplug.oob_hotplug_last_state, hpd_high);
+               need_work = true;
+       }
        spin_unlock_irq(&i915->irq_lock);
-       queue_delayed_work(i915->unordered_wq, &i915->display.hotplug.hotplug_work, 0);
+
+       if (need_work)
+               queue_delayed_work(i915->unordered_wq, &i915->display.hotplug.hotplug_work, 0);
 }
 
 static const struct drm_connector_funcs intel_dp_connector_funcs = {

diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
index 426c88a516e5112b64d4aa7ebf03bd0757993333..29f40e6587729f26c41c167b4dbfb492b42efc21 100644 (file)
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -153,11 +153,11 @@ static int dp_altmode_status_update(struct dp_altmode *dp)
                        }
                }
        } else {
-               if (dp->hpd != hpd) {
-                       drm_connector_oob_hotplug_event(dp->connector_fwnode);
-                       dp->hpd = hpd;
-                       sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
-               }
+               drm_connector_oob_hotplug_event(dp->connector_fwnode,
+                                               hpd ? connector_status_connected :
+                                                     connector_status_disconnected);
+               dp->hpd = hpd;
+               sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
        }
 
        return ret;
@@ -173,7 +173,8 @@ static int dp_altmode_configured(struct dp_altmode *dp)
         * configuration is complete to signal HPD.
         */
        if (dp->pending_hpd) {
-               drm_connector_oob_hotplug_event(dp->connector_fwnode);
+               drm_connector_oob_hotplug_event(dp->connector_fwnode,
+                                               connector_status_connected);
                sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
                dp->pending_hpd = false;
        }
@@ -618,8 +619,8 @@ void dp_altmode_remove(struct typec_altmode *alt)
        cancel_work_sync(&dp->work);
 
        if (dp->connector_fwnode) {
-               if (dp->hpd)
-                       drm_connector_oob_hotplug_event(dp->connector_fwnode);
+               drm_connector_oob_hotplug_event(dp->connector_fwnode,
+                                               connector_status_disconnected);
 
                fwnode_handle_put(dp->connector_fwnode);
        }

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 6302caa0bd510cb5f14365a74f642e11b9691a3f..fe88d7fc6b8f4cc92262bfc917a4ee21fd27f2c0 100644 (file)
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1336,7 +1336,8 @@ struct drm_connector_funcs {
         * This will get called when a hotplug-event for a drm-connector
         * has been received from a source outside the display driver / device.
         */
-       void (*oob_hotplug_event)(struct drm_connector *connector);
+       void (*oob_hotplug_event)(struct drm_connector *connector,
+                                 enum drm_connector_status status);
 
        /**
         * @debugfs_init:
@@ -1980,7 +1981,8 @@ drm_connector_is_unregistered(struct drm_connector *connector)
                DRM_CONNECTOR_UNREGISTERED;
 }
 
-void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode);
+void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode,
+                                    enum drm_connector_status status);
 const char *drm_get_connector_type_name(unsigned int connector_type);
 const char *drm_get_connector_status_name(enum drm_connector_status status);
 const char *drm_get_subpixel_order_name(enum subpixel_order order);