| Message ID | 20210525105913.v5.3.If7fc06fd679af0665ada9ff0524291c61dd35d24@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5,1/3] drm/dp_mst: Add self-tests for up requests | expand |
Hi Sam,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on next-20210524]
[cannot apply to linux/master drm-intel/for-linux-next linus/master v5.13-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sam-McNally/drm-dp_mst-Add-self-tests-for-up-requests/20210525-090214
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
config: x86_64-randconfig-b001-20210524 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 99155e913e9bad5f7f8a247f8bb3a3ff3da74af1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# apt-get install iwyu # include-what-you-use
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sam-McNally/drm-dp_mst-Add-self-tests-for-up-requests/20210525-090214
git checkout 95cd83b87fc6deb810e6364643d8b6f198629bee
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross C=1 CHECK=iwyu ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
iwyu warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/drm_dp_cec.c:17:1: iwyu: warning: superfluous #include <drm/drm_dp_mst_helper.h>
drivers/gpu/drm/drm_dp_cec.c:9:1: iwyu: warning: superfluous #include <linux/module.h>
drivers/gpu/drm/drm_dp_cec.c:10:1: iwyu: warning: superfluous #include <linux/slab.h>
vim +17 drivers/gpu/drm/drm_dp_cec.c
0aa32f8e572e3e Sam Ravnborg 2019-10-07 13
ae85b0df124f69 Dariusz Marcinkiewicz 2019-08-14 14 #include <drm/drm_connector.h>
0aa32f8e572e3e Sam Ravnborg 2019-10-07 15 #include <drm/drm_device.h>
2c6d1fffa1d9b0 Hans Verkuil 2018-07-11 16 #include <drm/drm_dp_helper.h>
95cd83b87fc6de Sam McNally 2021-05-25 @17 #include <drm/drm_dp_mst_helper.h>
2c6d1fffa1d9b0 Hans Verkuil 2018-07-11 18
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hi Sam, Just a minor nitpick below: On 25/05/2021 02:59, Sam McNally wrote: > With DP v2.0 errata E5, CEC tunneling can be supported through an MST > topology. > > When tunneling CEC through an MST port, CEC IRQs are delivered via a > sink event notify message; when a sink event notify message is received, > trigger CEC IRQ handling - ESI1 is not used for remote CEC IRQs so its > value is not checked. > > Register and unregister for all MST connectors, ensuring their > drm_dp_aux_cec struct won't be accessed uninitialized. > > Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Signed-off-by: Sam McNally <sammc@chromium.org> > --- > > (no changes since v4) > > Changes in v4: > - Removed use of work queues > - Updated checks of aux.transfer to accept aux.is_remote > > Changes in v3: > - Fixed whitespace in drm_dp_cec_mst_irq_work() > - Moved drm_dp_cec_mst_set_edid_work() with the other set_edid functions > > Changes in v2: > - Used aux->is_remote instead of aux->cec.is_mst, removing the need for > the previous patch in the series > - Added a defensive check for null edid in the deferred set_edid work, > in case the edid is no longer valid at that point > > drivers/gpu/drm/drm_dp_cec.c | 20 ++++++++++++++++---- > drivers/gpu/drm/drm_dp_mst_topology.c | 24 ++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_cec.c b/drivers/gpu/drm/drm_dp_cec.c > index 3ab2609f9ec7..1abd3f4654dc 100644 > --- a/drivers/gpu/drm/drm_dp_cec.c > +++ b/drivers/gpu/drm/drm_dp_cec.c > @@ -14,6 +14,7 @@ > #include <drm/drm_connector.h> > #include <drm/drm_device.h> > #include <drm/drm_dp_helper.h> > +#include <drm/drm_dp_mst_helper.h> > > /* > * Unfortunately it turns out that we have a chicken-and-egg situation > @@ -245,13 +246,22 @@ void drm_dp_cec_irq(struct drm_dp_aux *aux) > int ret; > > /* No transfer function was set, so not a DP connector */ > - if (!aux->transfer) > + if (!aux->transfer && !aux->is_remote) > return; > > mutex_lock(&aux->cec.lock); > if (!aux->cec.adap) > goto unlock; > > + if (aux->is_remote) { > + /* > + * For remote connectors, CEC IRQ is triggered by an explicit > + * message so ESI1 is not involved. > + */ > + drm_dp_cec_handle_irq(aux); > + goto unlock; > + } > + > ret = drm_dp_dpcd_readb(aux, DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1, > &cec_irq); > if (ret < 0 || !(cec_irq & DP_CEC_IRQ)) > @@ -307,7 +317,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) > u8 cap; > > /* No transfer function was set, so not a DP connector */ > - if (!aux->transfer) > + if (!aux->transfer && !aux->is_remote) > return; > > #ifndef CONFIG_MEDIA_CEC_RC > @@ -375,6 +385,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) > unlock: > mutex_unlock(&aux->cec.lock); > } > + Spurious newline added, just drop this change. Regards, Hans > EXPORT_SYMBOL(drm_dp_cec_set_edid); > > /* > @@ -383,7 +394,7 @@ EXPORT_SYMBOL(drm_dp_cec_set_edid); > void drm_dp_cec_unset_edid(struct drm_dp_aux *aux) > { > /* No transfer function was set, so not a DP connector */ > - if (!aux->transfer) > + if (!aux->transfer && !aux->is_remote) > return; > > cancel_delayed_work_sync(&aux->cec.unregister_work); > @@ -393,6 +404,7 @@ void drm_dp_cec_unset_edid(struct drm_dp_aux *aux) > goto unlock; > > cec_phys_addr_invalidate(aux->cec.adap); > + > /* > * We're done if we want to keep the CEC device > * (drm_dp_cec_unregister_delay is >= NEVER_UNREG_DELAY) or if the > @@ -428,7 +440,7 @@ void drm_dp_cec_register_connector(struct drm_dp_aux *aux, > struct drm_connector *connector) > { > WARN_ON(aux->cec.adap); > - if (WARN_ON(!aux->transfer)) > + if (WARN_ON(!aux->transfer && !aux->is_remote)) > return; > aux->cec.connector = connector; > INIT_DELAYED_WORK(&aux->cec.unregister_work, > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index 29aad3b6b31a..5612caf9fb49 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -2359,6 +2359,8 @@ static void build_mst_prop_path(const struct drm_dp_mst_branch *mstb, > int drm_dp_mst_connector_late_register(struct drm_connector *connector, > struct drm_dp_mst_port *port) > { > + drm_dp_cec_register_connector(&port->aux, connector); > + > drm_dbg_kms(port->mgr->dev, "registering %s remote bus for %s\n", > port->aux.name, connector->kdev->kobj.name); > > @@ -2382,6 +2384,8 @@ void drm_dp_mst_connector_early_unregister(struct drm_connector *connector, > drm_dbg_kms(port->mgr->dev, "unregistering %s remote bus for %s\n", > port->aux.name, connector->kdev->kobj.name); > drm_dp_aux_unregister_devnode(&port->aux); > + > + drm_dp_cec_unregister_connector(&port->aux); > } > EXPORT_SYMBOL(drm_dp_mst_connector_early_unregister); > > @@ -2682,6 +2686,21 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb, > queue_work(system_long_wq, &mstb->mgr->work); > } > > +static void > +drm_dp_mst_handle_sink_event(struct drm_dp_mst_branch *mstb, > + struct drm_dp_sink_event_notify *sink_event) > +{ > + struct drm_dp_mst_port *port; > + > + if (sink_event->event_id & DP_SINK_EVENT_CEC_IRQ_EVENT) { > + port = drm_dp_get_port(mstb, sink_event->port_number); > + if (port) { > + drm_dp_cec_irq(&port->aux); > + drm_dp_mst_topology_put_port(port); > + } > + } > +} > + > static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_topology_mgr *mgr, > u8 lct, u8 *rad) > { > @@ -4170,6 +4189,8 @@ drm_dp_mst_process_up_req(struct drm_dp_mst_topology_mgr *mgr, > if (msg->req_type == DP_CONNECTION_STATUS_NOTIFY) { > drm_dp_mst_handle_conn_stat(mstb, &msg->u.conn_stat); > hotplug = true; > + } else if (msg->req_type == DP_SINK_EVENT_NOTIFY) { > + drm_dp_mst_handle_sink_event(mstb, &msg->u.sink_event); > } > > drm_dp_mst_topology_put_mstb(mstb); > @@ -4362,6 +4383,8 @@ drm_dp_mst_detect_port(struct drm_connector *connector, > break; > } > out: > + if (ret != connector_status_connected) > + drm_dp_cec_unset_edid(&port->aux); > drm_dp_mst_topology_put_port(port); > return ret; > } > @@ -4392,6 +4415,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_ > edid = drm_get_edid(connector, &port->aux.ddc); > } > port->has_audio = drm_detect_monitor_audio(edid); > + drm_dp_cec_set_edid(&port->aux, edid); > drm_dp_mst_topology_put_port(port); > return edid; > } >
On Tue, 2021-05-25 at 10:59 +1000, Sam McNally wrote: > With DP v2.0 errata E5, CEC tunneling can be supported through an MST > topology. > > When tunneling CEC through an MST port, CEC IRQs are delivered via a > sink event notify message; when a sink event notify message is received, > trigger CEC IRQ handling - ESI1 is not used for remote CEC IRQs so its > value is not checked. > > Register and unregister for all MST connectors, ensuring their > drm_dp_aux_cec struct won't be accessed uninitialized. > > Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Signed-off-by: Sam McNally <sammc@chromium.org> > --- > > (no changes since v4) > > Changes in v4: > - Removed use of work queues > - Updated checks of aux.transfer to accept aux.is_remote > > Changes in v3: > - Fixed whitespace in drm_dp_cec_mst_irq_work() > - Moved drm_dp_cec_mst_set_edid_work() with the other set_edid functions > > Changes in v2: > - Used aux->is_remote instead of aux->cec.is_mst, removing the need for > the previous patch in the series > - Added a defensive check for null edid in the deferred set_edid work, > in case the edid is no longer valid at that point > > drivers/gpu/drm/drm_dp_cec.c | 20 ++++++++++++++++---- > drivers/gpu/drm/drm_dp_mst_topology.c | 24 ++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_cec.c b/drivers/gpu/drm/drm_dp_cec.c > index 3ab2609f9ec7..1abd3f4654dc 100644 > --- a/drivers/gpu/drm/drm_dp_cec.c > +++ b/drivers/gpu/drm/drm_dp_cec.c > @@ -14,6 +14,7 @@ > #include <drm/drm_connector.h> > #include <drm/drm_device.h> > #include <drm/drm_dp_helper.h> > +#include <drm/drm_dp_mst_helper.h> > > /* > * Unfortunately it turns out that we have a chicken-and-egg situation > @@ -245,13 +246,22 @@ void drm_dp_cec_irq(struct drm_dp_aux *aux) > int ret; > > /* No transfer function was set, so not a DP connector */ > - if (!aux->transfer) > + if (!aux->transfer && !aux->is_remote) > return; > > mutex_lock(&aux->cec.lock); > if (!aux->cec.adap) > goto unlock; > > + if (aux->is_remote) { > + /* > + * For remote connectors, CEC IRQ is triggered by an > explicit > + * message so ESI1 is not involved. > + */ > + drm_dp_cec_handle_irq(aux); > + goto unlock; > + } > + > ret = drm_dp_dpcd_readb(aux, DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1, > &cec_irq); > if (ret < 0 || !(cec_irq & DP_CEC_IRQ)) > @@ -307,7 +317,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const > struct edid *edid) > u8 cap; > > /* No transfer function was set, so not a DP connector */ > - if (!aux->transfer) > + if (!aux->transfer && !aux->is_remote) > return; > > #ifndef CONFIG_MEDIA_CEC_RC > @@ -375,6 +385,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const > struct edid *edid) > unlock: > mutex_unlock(&aux->cec.lock); > } > + > EXPORT_SYMBOL(drm_dp_cec_set_edid); probably want to get rid of this whitespace With that fixed, this is: Reviewed-by: Lyude Paul <lyude@redhat.com> > > /* > @@ -383,7 +394,7 @@ EXPORT_SYMBOL(drm_dp_cec_set_edid); > void drm_dp_cec_unset_edid(struct drm_dp_aux *aux) > { > /* No transfer function was set, so not a DP connector */ > - if (!aux->transfer) > + if (!aux->transfer && !aux->is_remote) > return; > > cancel_delayed_work_sync(&aux->cec.unregister_work); > @@ -393,6 +404,7 @@ void drm_dp_cec_unset_edid(struct drm_dp_aux *aux) > goto unlock; > > cec_phys_addr_invalidate(aux->cec.adap); > + > /* > * We're done if we want to keep the CEC device > * (drm_dp_cec_unregister_delay is >= NEVER_UNREG_DELAY) or if the > @@ -428,7 +440,7 @@ void drm_dp_cec_register_connector(struct drm_dp_aux > *aux, > struct drm_connector *connector) > { > WARN_ON(aux->cec.adap); > - if (WARN_ON(!aux->transfer)) > + if (WARN_ON(!aux->transfer && !aux->is_remote)) > return; > aux->cec.connector = connector; > INIT_DELAYED_WORK(&aux->cec.unregister_work, > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c > b/drivers/gpu/drm/drm_dp_mst_topology.c > index 29aad3b6b31a..5612caf9fb49 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -2359,6 +2359,8 @@ static void build_mst_prop_path(const struct > drm_dp_mst_branch *mstb, > int drm_dp_mst_connector_late_register(struct drm_connector *connector, > struct drm_dp_mst_port *port) > { > + drm_dp_cec_register_connector(&port->aux, connector); > + > drm_dbg_kms(port->mgr->dev, "registering %s remote bus for %s\n", > port->aux.name, connector->kdev->kobj.name); > > @@ -2382,6 +2384,8 @@ void drm_dp_mst_connector_early_unregister(struct > drm_connector *connector, > drm_dbg_kms(port->mgr->dev, "unregistering %s remote bus for %s\n", > port->aux.name, connector->kdev->kobj.name); > drm_dp_aux_unregister_devnode(&port->aux); > + > + drm_dp_cec_unregister_connector(&port->aux); > } > EXPORT_SYMBOL(drm_dp_mst_connector_early_unregister); > > @@ -2682,6 +2686,21 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch > *mstb, > queue_work(system_long_wq, &mstb->mgr->work); > } > > +static void > +drm_dp_mst_handle_sink_event(struct drm_dp_mst_branch *mstb, > + struct drm_dp_sink_event_notify *sink_event) > +{ > + struct drm_dp_mst_port *port; > + > + if (sink_event->event_id & DP_SINK_EVENT_CEC_IRQ_EVENT) { > + port = drm_dp_get_port(mstb, sink_event->port_number); > + if (port) { > + drm_dp_cec_irq(&port->aux); > + drm_dp_mst_topology_put_port(port); > + } > + } > +} > + > static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct > drm_dp_mst_topology_mgr *mgr, > u8 lct, u8 > *rad) > { > @@ -4170,6 +4189,8 @@ drm_dp_mst_process_up_req(struct > drm_dp_mst_topology_mgr *mgr, > if (msg->req_type == DP_CONNECTION_STATUS_NOTIFY) { > drm_dp_mst_handle_conn_stat(mstb, &msg->u.conn_stat); > hotplug = true; > + } else if (msg->req_type == DP_SINK_EVENT_NOTIFY) { > + drm_dp_mst_handle_sink_event(mstb, &msg->u.sink_event); > } > > drm_dp_mst_topology_put_mstb(mstb); > @@ -4362,6 +4383,8 @@ drm_dp_mst_detect_port(struct drm_connector > *connector, > break; > } > out: > + if (ret != connector_status_connected) > + drm_dp_cec_unset_edid(&port->aux); > drm_dp_mst_topology_put_port(port); > return ret; > } > @@ -4392,6 +4415,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector > *connector, struct drm_dp_ > edid = drm_get_edid(connector, &port->aux.ddc); > } > port->has_audio = drm_detect_monitor_audio(edid); > + drm_dp_cec_set_edid(&port->aux, edid); > drm_dp_mst_topology_put_port(port); > return edid; > }
diff --git a/drivers/gpu/drm/drm_dp_cec.c b/drivers/gpu/drm/drm_dp_cec.c index 3ab2609f9ec7..1abd3f4654dc 100644 --- a/drivers/gpu/drm/drm_dp_cec.c +++ b/drivers/gpu/drm/drm_dp_cec.c @@ -14,6 +14,7 @@ #include <drm/drm_connector.h> #include <drm/drm_device.h> #include <drm/drm_dp_helper.h> +#include <drm/drm_dp_mst_helper.h> /* * Unfortunately it turns out that we have a chicken-and-egg situation @@ -245,13 +246,22 @@ void drm_dp_cec_irq(struct drm_dp_aux *aux) int ret; /* No transfer function was set, so not a DP connector */ - if (!aux->transfer) + if (!aux->transfer && !aux->is_remote) return; mutex_lock(&aux->cec.lock); if (!aux->cec.adap) goto unlock; + if (aux->is_remote) { + /* + * For remote connectors, CEC IRQ is triggered by an explicit + * message so ESI1 is not involved. + */ + drm_dp_cec_handle_irq(aux); + goto unlock; + } + ret = drm_dp_dpcd_readb(aux, DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1, &cec_irq); if (ret < 0 || !(cec_irq & DP_CEC_IRQ)) @@ -307,7 +317,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) u8 cap; /* No transfer function was set, so not a DP connector */ - if (!aux->transfer) + if (!aux->transfer && !aux->is_remote) return; #ifndef CONFIG_MEDIA_CEC_RC @@ -375,6 +385,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) unlock: mutex_unlock(&aux->cec.lock); } + EXPORT_SYMBOL(drm_dp_cec_set_edid); /* @@ -383,7 +394,7 @@ EXPORT_SYMBOL(drm_dp_cec_set_edid); void drm_dp_cec_unset_edid(struct drm_dp_aux *aux) { /* No transfer function was set, so not a DP connector */ - if (!aux->transfer) + if (!aux->transfer && !aux->is_remote) return; cancel_delayed_work_sync(&aux->cec.unregister_work); @@ -393,6 +404,7 @@ void drm_dp_cec_unset_edid(struct drm_dp_aux *aux) goto unlock; cec_phys_addr_invalidate(aux->cec.adap); + /* * We're done if we want to keep the CEC device * (drm_dp_cec_unregister_delay is >= NEVER_UNREG_DELAY) or if the @@ -428,7 +440,7 @@ void drm_dp_cec_register_connector(struct drm_dp_aux *aux, struct drm_connector *connector) { WARN_ON(aux->cec.adap); - if (WARN_ON(!aux->transfer)) + if (WARN_ON(!aux->transfer && !aux->is_remote)) return; aux->cec.connector = connector; INIT_DELAYED_WORK(&aux->cec.unregister_work, diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 29aad3b6b31a..5612caf9fb49 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2359,6 +2359,8 @@ static void build_mst_prop_path(const struct drm_dp_mst_branch *mstb, int drm_dp_mst_connector_late_register(struct drm_connector *connector, struct drm_dp_mst_port *port) { + drm_dp_cec_register_connector(&port->aux, connector); + drm_dbg_kms(port->mgr->dev, "registering %s remote bus for %s\n", port->aux.name, connector->kdev->kobj.name); @@ -2382,6 +2384,8 @@ void drm_dp_mst_connector_early_unregister(struct drm_connector *connector, drm_dbg_kms(port->mgr->dev, "unregistering %s remote bus for %s\n", port->aux.name, connector->kdev->kobj.name); drm_dp_aux_unregister_devnode(&port->aux); + + drm_dp_cec_unregister_connector(&port->aux); } EXPORT_SYMBOL(drm_dp_mst_connector_early_unregister); @@ -2682,6 +2686,21 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb, queue_work(system_long_wq, &mstb->mgr->work); } +static void +drm_dp_mst_handle_sink_event(struct drm_dp_mst_branch *mstb, + struct drm_dp_sink_event_notify *sink_event) +{ + struct drm_dp_mst_port *port; + + if (sink_event->event_id & DP_SINK_EVENT_CEC_IRQ_EVENT) { + port = drm_dp_get_port(mstb, sink_event->port_number); + if (port) { + drm_dp_cec_irq(&port->aux); + drm_dp_mst_topology_put_port(port); + } + } +} + static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_topology_mgr *mgr, u8 lct, u8 *rad) { @@ -4170,6 +4189,8 @@ drm_dp_mst_process_up_req(struct drm_dp_mst_topology_mgr *mgr, if (msg->req_type == DP_CONNECTION_STATUS_NOTIFY) { drm_dp_mst_handle_conn_stat(mstb, &msg->u.conn_stat); hotplug = true; + } else if (msg->req_type == DP_SINK_EVENT_NOTIFY) { + drm_dp_mst_handle_sink_event(mstb, &msg->u.sink_event); } drm_dp_mst_topology_put_mstb(mstb); @@ -4362,6 +4383,8 @@ drm_dp_mst_detect_port(struct drm_connector *connector, break; } out: + if (ret != connector_status_connected) + drm_dp_cec_unset_edid(&port->aux); drm_dp_mst_topology_put_port(port); return ret; } @@ -4392,6 +4415,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_ edid = drm_get_edid(connector, &port->aux.ddc); } port->has_audio = drm_detect_monitor_audio(edid); + drm_dp_cec_set_edid(&port->aux, edid); drm_dp_mst_topology_put_port(port); return edid; }