Hi all,
On Thu, 12 Oct 2023 12:27:49 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm':
> > drivers/usb/typec/altmodes/displayport.c:309:33: error: too few arguments to function 'drm_connector_oob_hotplug_event'
> > 309 | drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > In file included from drivers/usb/typec/altmodes/displayport.c:17:
> > include/drm/drm_connector.h:1984:6: note: declared here
> > 1984 | void drm_connector_oob_hotplug_event(struct fwnode_handle *connector_fwnode,
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > fc93835bb0d7 ("drm: Add HPD state to drm_connector_oob_hotplug_event()")
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
> >
> > from the usb.current tree.
> >
> > I have applied the following merge fix patch.
> >
> > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Date: Thu, 12 Oct 2023 12:17:31 +1100
> > Subject: [PATCH] fix up for "drm: Add HPD state to
> > drm_connector_oob_hotplug_event()"
> >
> > interacting with commit
> >
> > 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
> >
> > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > ---
> > drivers/usb/typec/altmodes/displayport.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
> > index ddfb5b6ace4f..eb0bf08fc97a 100644
> > --- a/drivers/usb/typec/altmodes/displayport.c
> > +++ b/drivers/usb/typec/altmodes/displayport.c
> > @@ -306,7 +306,8 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
> > dp->data.status = 0;
> > dp->data.conf = 0;
> > if (dp->hpd) {
> > - drm_connector_oob_hotplug_event(dp->connector_fwnode);
> > + drm_connector_oob_hotplug_event(dp->connector_fwnode
>
> Pretend that there is a comma at the end of the above line :-)
>
> > + connector_status_disconnected);
> > dp->hpd = false;
> > sysfs_notify(&dp->alt->dev.kobj, "displayport", "hpd");
> > }
> > --
> > 2.40.1
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpmyy4OqB1u0.pgp
Description: OpenPGP digital signature
