| Message ID | 20220208044328.588860-1-bjorn.andersson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] drm: Add HPD state to drm_connector_oob_hotplug_event() | expand |
On Tue 08 Feb 02:39 PST 2022, Greg Kroah-Hartman wrote: > On Mon, Feb 07, 2022 at 08:43:27PM -0800, Bjorn Andersson wrote: > > 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> > > --- > > > > Note that the Intel driver has only been compile tested with this patch. > > > > drivers/gpu/drm/drm_connector.c | 6 ++++-- > > drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++--- > > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > > drivers/usb/typec/altmodes/displayport.c | 9 ++------- > > include/drm/drm_connector.h | 5 +++-- > > 5 files changed, 23 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > > index a50c82bc2b2f..ad7295597c0f 100644 > > --- a/drivers/gpu/drm/drm_connector.c > > +++ b/drivers/gpu/drm/drm_connector.c > > @@ -2825,6 +2825,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 > > + * @hpd_state: number of data lanes available > > "number"? > > > * > > * 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 > > @@ -2834,7 +2835,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, > > + bool hpd_state) > > This is a boolean, how can it be a number? > The kerneldoc wasn't appropriately updated as this went from being "number of data lanes" to "the hot plug detect (hpd) state". > And having a "flag" like this is a pain, how do you know what the > parameter really means? > You're right, "state" isn't a boolean property, let's rename it "hpd_high" to clarify it. > > { > > struct drm_connector *connector; > > > > @@ -2843,7 +2845,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, hpd_state); > > > > drm_connector_put(connector); > > } > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > > index 146b83916005..00520867d37b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -4816,15 +4816,23 @@ 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, bool hpd_state) > > { > > struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); > > struct drm_i915_private *i915 = to_i915(connector->dev); > > + bool need_work = false; > > > > spin_lock_irq(&i915->irq_lock); > > - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > > + if (hpd_state != i915->hotplug.oob_hotplug_state) { > > + i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > > + > > + i915->hotplug.oob_hotplug_state = hpd_state; > > + need_work = true; > > + } > > spin_unlock_irq(&i915->irq_lock); > > - queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > > + > > + if (need_work) > > + queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > > } > > > > static const struct drm_connector_funcs intel_dp_connector_funcs = { > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index 8c1706fd81f9..543ebf1cfcf4 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -149,6 +149,9 @@ struct i915_hotplug { > > /* Whether or not to count short HPD IRQs in HPD storms */ > > u8 hpd_short_storm_enabled; > > > > + /* Last state reported by oob_hotplug_event */ > > + bool oob_hotplug_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/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c > > index c1d8c23baa39..a4596be4d34a 100644 > > --- a/drivers/usb/typec/altmodes/displayport.c > > +++ b/drivers/usb/typec/altmodes/displayport.c > > @@ -59,7 +59,6 @@ struct dp_altmode { > > struct typec_displayport_data data; > > > > enum dp_state state; > > - bool hpd; > > > > struct mutex lock; /* device lock */ > > struct work_struct work; > > @@ -143,10 +142,7 @@ static int dp_altmode_status_update(struct dp_altmode *dp) > > if (!ret) > > dp->state = DP_STATE_CONFIGURE; > > } else { > > - if (dp->hpd != hpd) { > > - drm_connector_oob_hotplug_event(dp->connector_fwnode); > > - dp->hpd = hpd; > > - } > > + drm_connector_oob_hotplug_event(dp->connector_fwnode, hpd); > > } > > > > return ret; > > @@ -573,8 +569,7 @@ 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, false); > > See, what does "false" here mean? > > Name the function for what it does, do not have random flags as > parameters, that makes it impossible to understand what the code is > doing when you are reading it, without having to jump around and figure > out what the flags are saying. > > And here they just don't even seem to be right :( > Both the old and new code will signal to the DRM driver that the cable was removed, the change is that we're carrying the level in the call rather than just indicating that the state has changed. We could introduce some HPD_HIGH/HPD_LOW defines to make it easier to read. But the various places I'm looking at just represented the hpd state as a bool. Regards, Bjorn
On Thu, 10 Feb 2022 at 23:54, Bjorn Andersson <bjorn.andersson@linaro.org> wrote: > > On Tue 08 Feb 02:39 PST 2022, Greg Kroah-Hartman wrote: > > > On Mon, Feb 07, 2022 at 08:43:27PM -0800, Bjorn Andersson wrote: > > > 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> > > > --- > > > > > > Note that the Intel driver has only been compile tested with this patch. > > > > > > drivers/gpu/drm/drm_connector.c | 6 ++++-- > > > drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++--- > > > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > > > drivers/usb/typec/altmodes/displayport.c | 9 ++------- > > > include/drm/drm_connector.h | 5 +++-- > > > 5 files changed, 23 insertions(+), 14 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > > > index a50c82bc2b2f..ad7295597c0f 100644 > > > --- a/drivers/gpu/drm/drm_connector.c > > > +++ b/drivers/gpu/drm/drm_connector.c > > > @@ -2825,6 +2825,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 > > > + * @hpd_state: number of data lanes available > > > > "number"? > > > > > * > > > * 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 > > > @@ -2834,7 +2835,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, > > > + bool hpd_state) > > > > This is a boolean, how can it be a number? > > > > The kerneldoc wasn't appropriately updated as this went from being > "number of data lanes" to "the hot plug detect (hpd) state". > > > And having a "flag" like this is a pain, how do you know what the > > parameter really means? > > > > You're right, "state" isn't a boolean property, let's rename it > "hpd_high" to clarify it. "connected" ? > > > > { > > > struct drm_connector *connector; > > > > > > @@ -2843,7 +2845,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, hpd_state); > > > > > > drm_connector_put(connector); > > > } > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > > > index 146b83916005..00520867d37b 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > > @@ -4816,15 +4816,23 @@ 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, bool hpd_state) > > > { > > > struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); > > > struct drm_i915_private *i915 = to_i915(connector->dev); > > > + bool need_work = false; > > > > > > spin_lock_irq(&i915->irq_lock); > > > - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > > > + if (hpd_state != i915->hotplug.oob_hotplug_state) { > > > + i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > > > + > > > + i915->hotplug.oob_hotplug_state = hpd_state; > > > + need_work = true; > > > + } > > > spin_unlock_irq(&i915->irq_lock); > > > - queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > > > + > > > + if (need_work) > > > + queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > > > } > > > > > > static const struct drm_connector_funcs intel_dp_connector_funcs = { > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > > index 8c1706fd81f9..543ebf1cfcf4 100644 > > > --- a/drivers/gpu/drm/i915/i915_drv.h > > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > > @@ -149,6 +149,9 @@ struct i915_hotplug { > > > /* Whether or not to count short HPD IRQs in HPD storms */ > > > u8 hpd_short_storm_enabled; > > > > > > + /* Last state reported by oob_hotplug_event */ > > > + bool oob_hotplug_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/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c > > > index c1d8c23baa39..a4596be4d34a 100644 > > > --- a/drivers/usb/typec/altmodes/displayport.c > > > +++ b/drivers/usb/typec/altmodes/displayport.c > > > @@ -59,7 +59,6 @@ struct dp_altmode { > > > struct typec_displayport_data data; > > > > > > enum dp_state state; > > > - bool hpd; > > > > > > struct mutex lock; /* device lock */ > > > struct work_struct work; > > > @@ -143,10 +142,7 @@ static int dp_altmode_status_update(struct dp_altmode *dp) > > > if (!ret) > > > dp->state = DP_STATE_CONFIGURE; > > > } else { > > > - if (dp->hpd != hpd) { > > > - drm_connector_oob_hotplug_event(dp->connector_fwnode); > > > - dp->hpd = hpd; > > > - } > > > + drm_connector_oob_hotplug_event(dp->connector_fwnode, hpd); > > > } > > > > > > return ret; > > > @@ -573,8 +569,7 @@ 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, false); > > > > See, what does "false" here mean? > > > > Name the function for what it does, do not have random flags as > > parameters, that makes it impossible to understand what the code is > > doing when you are reading it, without having to jump around and figure > > out what the flags are saying. > > > > And here they just don't even seem to be right :( > > > > Both the old and new code will signal to the DRM driver that the cable > was removed, the change is that we're carrying the level in the call > rather than just indicating that the state has changed. > > We could introduce some HPD_HIGH/HPD_LOW defines to make it easier to > read. But the various places I'm looking at just represented the hpd > state as a bool. > > Regards, > Bjorn
On Mon 07 Feb 23:40 PST 2022, Greg Kroah-Hartman wrote: > On Mon, Feb 07, 2022 at 08:43:28PM -0800, Bjorn Andersson wrote: > > The Qualcomm DisplayPort driver contains traces of the necessary > > plumbing to hook up USB HPD, in the form of the dp_hpd module and the > > dp_usbpd_cb struct. Use this as basis for implementing the > > oob_hotplug_event() callback, by amending the dp_hpd module with the > > missing logic. > > > > Overall the solution is similar to what's done downstream, but upstream > > all the code to disect the HPD notification lives on the calling side of > > drm_connector_oob_hotplug_event(). > > > > drm_connector_oob_hotplug_event() performs the lookup of the > > drm_connector based on fwnode, hence the need to assign the fwnode in > > dp_drm_connector_init(). > > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > --- > > drivers/gpu/drm/msm/dp/dp_display.c | 8 ++++++++ > > drivers/gpu/drm/msm/dp/dp_display.h | 2 ++ > > drivers/gpu/drm/msm/dp/dp_drm.c | 10 ++++++++++ > > drivers/gpu/drm/msm/dp/dp_hpd.c | 19 +++++++++++++++++++ > > drivers/gpu/drm/msm/dp/dp_hpd.h | 4 ++++ > > 5 files changed, 43 insertions(+) > > > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > > index 7cc4d21f2091..124a2f794382 100644 > > --- a/drivers/gpu/drm/msm/dp/dp_display.c > > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > > @@ -414,6 +414,13 @@ static int dp_display_usbpd_configure_cb(struct device *dev) > > return dp_display_process_hpd_high(dp); > > } > > > > +void dp_display_oob_hotplug_event(struct msm_dp *dp_display, bool hpd_state) > > +{ > > + struct dp_display_private *dp = container_of(dp_display, struct dp_display_private, dp_display); > > + > > + dp->usbpd->oob_event(dp->usbpd, hpd_state); > > +} > > + > > static int dp_display_usbpd_disconnect_cb(struct device *dev) > > { > > struct dp_display_private *dp = dev_get_dp_display_private(dev); > > @@ -1251,6 +1258,7 @@ static int dp_display_probe(struct platform_device *pdev) > > dp->pdev = pdev; > > dp->name = "drm_dp"; > > dp->dp_display.connector_type = desc->connector_type; > > + dp->dp_display.dev = &pdev->dev; > > You did not properly reference count this pointer you just saved. What > is to keep that pointer from going away without you knowing about it? > The "dp" object only lives while &pdev->dev is alive, both logically and as its devres allocated on &pdev-dev. So for this reference I don't see that we should refcount it. > And you already have a pointer to pdev, why save another one here? > The Qualcomm DisplayPort driver has per-c-file private context structs and "dp" is one such object. So I simply can't dereference it and get to pdev from the other c-file in the same driver... But I only need it in dp_drm.c to during initialization to get a reference to the associated fwnode, so it seems that I can rework this and pass the pointer as a parameter to dp_drm_connector_init(). That looks to be cleaner as well. Thanks, Bjorn
On Thu 10 Feb 13:12 PST 2022, Dmitry Baryshkov wrote: > On Thu, 10 Feb 2022 at 23:54, Bjorn Andersson > <bjorn.andersson@linaro.org> wrote: > > > > On Tue 08 Feb 02:39 PST 2022, Greg Kroah-Hartman wrote: > > > > > On Mon, Feb 07, 2022 at 08:43:27PM -0800, Bjorn Andersson wrote: > > > > 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> > > > > --- > > > > > > > > Note that the Intel driver has only been compile tested with this patch. > > > > > > > > drivers/gpu/drm/drm_connector.c | 6 ++++-- > > > > drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++--- > > > > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > > > > drivers/usb/typec/altmodes/displayport.c | 9 ++------- > > > > include/drm/drm_connector.h | 5 +++-- > > > > 5 files changed, 23 insertions(+), 14 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > > > > index a50c82bc2b2f..ad7295597c0f 100644 > > > > --- a/drivers/gpu/drm/drm_connector.c > > > > +++ b/drivers/gpu/drm/drm_connector.c > > > > @@ -2825,6 +2825,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 > > > > + * @hpd_state: number of data lanes available > > > > > > "number"? > > > > > > > * > > > > * 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 > > > > @@ -2834,7 +2835,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, > > > > + bool hpd_state) > > > > > > This is a boolean, how can it be a number? > > > > > > > The kerneldoc wasn't appropriately updated as this went from being > > "number of data lanes" to "the hot plug detect (hpd) state". > > > > > And having a "flag" like this is a pain, how do you know what the > > > parameter really means? > > > > > > > You're right, "state" isn't a boolean property, let's rename it > > "hpd_high" to clarify it. > > "connected" ? > I've been trying to find some references to point to, but my understanding is that in a DisplayPort or HDMI connector/cable you have a dedicated HPD pin, which when high denotes the sink is alive _and_ EDID can be read. So in a situation where you have a multifunction USB & DP/HDMI hub where you connect a display, you might have the USB hub connected to the host and you might even have your sink connected, but HPD could still be low until the display is ready to talk to you. So physically everything is connected, but this property will still be "not connected". As such I don't think it's appropriate to name it "connected". Regards, Bjorn > > > > > > { > > > > struct drm_connector *connector; > > > > > > > > @@ -2843,7 +2845,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, hpd_state); > > > > > > > > drm_connector_put(connector); > > > > } > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > > > > index 146b83916005..00520867d37b 100644 > > > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > > > @@ -4816,15 +4816,23 @@ 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, bool hpd_state) > > > > { > > > > struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); > > > > struct drm_i915_private *i915 = to_i915(connector->dev); > > > > + bool need_work = false; > > > > > > > > spin_lock_irq(&i915->irq_lock); > > > > - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > > > > + if (hpd_state != i915->hotplug.oob_hotplug_state) { > > > > + i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > > > > + > > > > + i915->hotplug.oob_hotplug_state = hpd_state; > > > > + need_work = true; > > > > + } > > > > spin_unlock_irq(&i915->irq_lock); > > > > - queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > > > > + > > > > + if (need_work) > > > > + queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > > > > } > > > > > > > > static const struct drm_connector_funcs intel_dp_connector_funcs = { > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > > > index 8c1706fd81f9..543ebf1cfcf4 100644 > > > > --- a/drivers/gpu/drm/i915/i915_drv.h > > > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > > > @@ -149,6 +149,9 @@ struct i915_hotplug { > > > > /* Whether or not to count short HPD IRQs in HPD storms */ > > > > u8 hpd_short_storm_enabled; > > > > > > > > + /* Last state reported by oob_hotplug_event */ > > > > + bool oob_hotplug_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/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c > > > > index c1d8c23baa39..a4596be4d34a 100644 > > > > --- a/drivers/usb/typec/altmodes/displayport.c > > > > +++ b/drivers/usb/typec/altmodes/displayport.c > > > > @@ -59,7 +59,6 @@ struct dp_altmode { > > > > struct typec_displayport_data data; > > > > > > > > enum dp_state state; > > > > - bool hpd; > > > > > > > > struct mutex lock; /* device lock */ > > > > struct work_struct work; > > > > @@ -143,10 +142,7 @@ static int dp_altmode_status_update(struct dp_altmode *dp) > > > > if (!ret) > > > > dp->state = DP_STATE_CONFIGURE; > > > > } else { > > > > - if (dp->hpd != hpd) { > > > > - drm_connector_oob_hotplug_event(dp->connector_fwnode); > > > > - dp->hpd = hpd; > > > > - } > > > > + drm_connector_oob_hotplug_event(dp->connector_fwnode, hpd); > > > > } > > > > > > > > return ret; > > > > @@ -573,8 +569,7 @@ 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, false); > > > > > > See, what does "false" here mean? > > > > > > Name the function for what it does, do not have random flags as > > > parameters, that makes it impossible to understand what the code is > > > doing when you are reading it, without having to jump around and figure > > > out what the flags are saying. > > > > > > And here they just don't even seem to be right :( > > > > > > > Both the old and new code will signal to the DRM driver that the cable > > was removed, the change is that we're carrying the level in the call > > rather than just indicating that the state has changed. > > > > We could introduce some HPD_HIGH/HPD_LOW defines to make it easier to > > read. But the various places I'm looking at just represented the hpd > > state as a bool. > > > > Regards, > > Bjorn > > > > -- > With best wishes > Dmitry
On Mon, Feb 07, 2022 at 08:43:27PM -0800, Bjorn Andersson wrote: > 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> > --- > > Note that the Intel driver has only been compile tested with this patch. > > drivers/gpu/drm/drm_connector.c | 6 ++++-- > drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++--- > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > drivers/usb/typec/altmodes/displayport.c | 9 ++------- > include/drm/drm_connector.h | 5 +++-- > 5 files changed, 23 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > index a50c82bc2b2f..ad7295597c0f 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -2825,6 +2825,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 > + * @hpd_state: number of data lanes available > * > * 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 > @@ -2834,7 +2835,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, > + bool hpd_state) > { > struct drm_connector *connector; > > @@ -2843,7 +2845,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, hpd_state); > > drm_connector_put(connector); > } > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 146b83916005..00520867d37b 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -4816,15 +4816,23 @@ 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, bool hpd_state) > { > struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); > struct drm_i915_private *i915 = to_i915(connector->dev); > + bool need_work = false; > > spin_lock_irq(&i915->irq_lock); > - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > + if (hpd_state != i915->hotplug.oob_hotplug_state) { hpd_state is speific to the encoder (pin) so similarly to event_bits oob_hotplug_state should be a bitmask as well. > + i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > + > + i915->hotplug.oob_hotplug_state = hpd_state; > + need_work = true; > + } > spin_unlock_irq(&i915->irq_lock); > - queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > + > + if (need_work) > + queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); > } > > static const struct drm_connector_funcs intel_dp_connector_funcs = { > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 8c1706fd81f9..543ebf1cfcf4 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -149,6 +149,9 @@ struct i915_hotplug { > /* Whether or not to count short HPD IRQs in HPD storms */ > u8 hpd_short_storm_enabled; > > + /* Last state reported by oob_hotplug_event */ > + bool oob_hotplug_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/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c > index c1d8c23baa39..a4596be4d34a 100644 > --- a/drivers/usb/typec/altmodes/displayport.c > +++ b/drivers/usb/typec/altmodes/displayport.c > @@ -59,7 +59,6 @@ struct dp_altmode { > struct typec_displayport_data data; > > enum dp_state state; > - bool hpd; > > struct mutex lock; /* device lock */ > struct work_struct work; > @@ -143,10 +142,7 @@ static int dp_altmode_status_update(struct dp_altmode *dp) > if (!ret) > dp->state = DP_STATE_CONFIGURE; > } else { > - if (dp->hpd != hpd) { > - drm_connector_oob_hotplug_event(dp->connector_fwnode); > - dp->hpd = hpd; > - } > + drm_connector_oob_hotplug_event(dp->connector_fwnode, hpd); > } > > return ret; > @@ -573,8 +569,7 @@ 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, false); > > fwnode_handle_put(dp->connector_fwnode); > } > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 64cf5f88c05b..7c90b8eb2ace 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1141,7 +1141,7 @@ 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, bool hpd_state); > }; > > /** > @@ -1742,7 +1742,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, > + bool hpd_state); > 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); > -- > 2.33.1 >
On Mon 14 Feb 09:59 PST 2022, Imre Deak wrote: > On Mon, Feb 07, 2022 at 08:43:27PM -0800, Bjorn Andersson wrote: > > 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> > > --- > > > > Note that the Intel driver has only been compile tested with this patch. > > > > drivers/gpu/drm/drm_connector.c | 6 ++++-- > > drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++--- > > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > > drivers/usb/typec/altmodes/displayport.c | 9 ++------- > > include/drm/drm_connector.h | 5 +++-- > > 5 files changed, 23 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > > index a50c82bc2b2f..ad7295597c0f 100644 > > --- a/drivers/gpu/drm/drm_connector.c > > +++ b/drivers/gpu/drm/drm_connector.c > > @@ -2825,6 +2825,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 > > + * @hpd_state: number of data lanes available > > * > > * 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 > > @@ -2834,7 +2835,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, > > + bool hpd_state) > > { > > struct drm_connector *connector; > > > > @@ -2843,7 +2845,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, hpd_state); > > > > drm_connector_put(connector); > > } > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > > index 146b83916005..00520867d37b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -4816,15 +4816,23 @@ 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, bool hpd_state) > > { > > struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); > > struct drm_i915_private *i915 = to_i915(connector->dev); > > + bool need_work = false; > > > > spin_lock_irq(&i915->irq_lock); > > - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); > > + if (hpd_state != i915->hotplug.oob_hotplug_state) { > > hpd_state is speific to the encoder (pin) so similarly to event_bits > oob_hotplug_state should be a bitmask as well. > That makes sense, thanks for point it out! Regards, Bjorn
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index a50c82bc2b2f..ad7295597c0f 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2825,6 +2825,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 + * @hpd_state: number of data lanes available * * 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 @@ -2834,7 +2835,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, + bool hpd_state) { struct drm_connector *connector; @@ -2843,7 +2845,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, hpd_state); drm_connector_put(connector); } diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 146b83916005..00520867d37b 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4816,15 +4816,23 @@ 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, bool hpd_state) { struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector)); struct drm_i915_private *i915 = to_i915(connector->dev); + bool need_work = false; spin_lock_irq(&i915->irq_lock); - i915->hotplug.event_bits |= BIT(encoder->hpd_pin); + if (hpd_state != i915->hotplug.oob_hotplug_state) { + i915->hotplug.event_bits |= BIT(encoder->hpd_pin); + + i915->hotplug.oob_hotplug_state = hpd_state; + need_work = true; + } spin_unlock_irq(&i915->irq_lock); - queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); + + if (need_work) + queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0); } static const struct drm_connector_funcs intel_dp_connector_funcs = { diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8c1706fd81f9..543ebf1cfcf4 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -149,6 +149,9 @@ struct i915_hotplug { /* Whether or not to count short HPD IRQs in HPD storms */ u8 hpd_short_storm_enabled; + /* Last state reported by oob_hotplug_event */ + bool oob_hotplug_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/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c index c1d8c23baa39..a4596be4d34a 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -59,7 +59,6 @@ struct dp_altmode { struct typec_displayport_data data; enum dp_state state; - bool hpd; struct mutex lock; /* device lock */ struct work_struct work; @@ -143,10 +142,7 @@ static int dp_altmode_status_update(struct dp_altmode *dp) if (!ret) dp->state = DP_STATE_CONFIGURE; } else { - if (dp->hpd != hpd) { - drm_connector_oob_hotplug_event(dp->connector_fwnode); - dp->hpd = hpd; - } + drm_connector_oob_hotplug_event(dp->connector_fwnode, hpd); } return ret; @@ -573,8 +569,7 @@ 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, false); fwnode_handle_put(dp->connector_fwnode); } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 64cf5f88c05b..7c90b8eb2ace 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1141,7 +1141,7 @@ 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, bool hpd_state); }; /** @@ -1742,7 +1742,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, + bool hpd_state); 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);
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> --- Note that the Intel driver has only been compile tested with this patch. drivers/gpu/drm/drm_connector.c | 6 ++++-- drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++++++--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/usb/typec/altmodes/displayport.c | 9 ++------- include/drm/drm_connector.h | 5 +++-- 5 files changed, 23 insertions(+), 14 deletions(-)