Hi, On 8/24/21 10:45 AM, Jani Nikula wrote: > On Fri, 20 Aug 2021, Hans de Goede <hdego...@redhat.com> wrote: >> Hello drm-misc and drm-intel maintainers, >> >> My "Add support for out-of-band hotplug notification" patchset: >> https://patchwork.freedesktop.org/series/93763/ >> >> Is ready for merging now, as discussed on IRC I based this series >> on top drm-tip and when trying to apply the i915 parts on top >> of drm-misc this fails due to conflict. >> >> So as Jani suggested here is a pull-req for a topic-branch with the >> entire set, minus the troublesome i915 bits. Once this has been merged >> into both drm-misc-next and drm-intel-next I can push the 2 i915 >> patch do drm-intel-next on top of the merge. >> >> Note there are also 2 drivers/usb/typec patches in here these >> have Greg KH's Reviewed-by for merging through the drm tree, >> Since this USB code does not change all that much. I also checked >> and the drm-misc-next-2021-08-12 base of this tree contains the >> same last commit to the modified file as usb-next. >> >> Daniel Vetter mentioned on IRC that it might be better for you to simply >> pick-up the series directly from patchwork, that is fine too in that >> case don't forget to add: >> >> Reviewed-by: Lyude Paul <ly...@redhat.com> >> >> To the entire series (given in a reply to the cover-letter) >> >> And: >> >> Reviewed-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> >> >> To the usb/typec patches (patch 7/8), this was given in reply >> to a previous posting of the series and I forgot to add this >> in the resend. > > Since this is mostly touching drm core, I think it should be merged to > drm-misc-next first, and drm-intel-next after. Please let us know.
I agree this should go to drm-misc-next first. (I was planning on pushing this to drm-misc-next myself, but then ended up going with the topic branch because of the conflict in the i915 bits.) Regards, Hans >> The following changes since commit c7782443a88926a4f938f0193041616328cf2db2: >> >> drm/bridge: ti-sn65dsi86: Avoid creating multiple connectors (2021-08-12 >> 09:56:09 -0700) >> >> are available in the Git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git >> drm-misc-intel-oob-hotplug-v1 >> >> for you to fetch changes up to 7f811394878535ed9a6849717de8c2959ae38899: >> >> usb: typec: altmodes/displayport: Notify drm subsys of hotplug events >> (2021-08-20 12:35:59 +0200) >> >> ---------------------------------------------------------------- >> Topic branch for drm-misc / drm-intel for OOB hotplug support for Type-C >> connectors >> >> ---------------------------------------------------------------- >> Hans de Goede (6): >> drm/connector: Give connector sysfs devices there own device_type >> drm/connector: Add a fwnode pointer to drm_connector and register with >> ACPI (v2) >> drm/connector: Add drm_connector_find_by_fwnode() function (v3) >> drm/connector: Add support for out-of-band hotplug notification (v3) >> usb: typec: altmodes/displayport: Make dp_altmode_notify() more generic >> usb: typec: altmodes/displayport: Notify drm subsys of hotplug events >> >> drivers/gpu/drm/drm_connector.c | 79 +++++++++++++++++++++++++++++ >> drivers/gpu/drm/drm_crtc_internal.h | 2 + >> drivers/gpu/drm/drm_sysfs.c | 87 >> +++++++++++++++++++++++++++----- >> drivers/usb/typec/altmodes/Kconfig | 1 + >> drivers/usb/typec/altmodes/displayport.c | 58 +++++++++++++-------- >> include/drm/drm_connector.h | 25 +++++++++ >> 6 files changed, 217 insertions(+), 35 deletions(-) >> >