On 10.07.2023 12:02, Bryan O'Donoghue wrote: > On 09/07/2023 21:13, Dmitry Baryshkov wrote: >> The current approach to handling DP on bridge-enabled platforms requires >> a chain of DP bridges up to the USB-C connector. Register a last DRM >> bridge for such chain. >> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> >> --- >> drivers/usb/typec/tcpm/Kconfig | 1 + >> drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 39 +++++++++++++++++++ >> 2 files changed, 40 insertions(+) >> >> diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig >> index 5d393f520fc2..0b2993fef564 100644 >> --- a/drivers/usb/typec/tcpm/Kconfig >> +++ b/drivers/usb/typec/tcpm/Kconfig >> @@ -79,6 +79,7 @@ config TYPEC_WCOVE >> config TYPEC_QCOM_PMIC >> tristate "Qualcomm PMIC USB Type-C Port Controller Manager driver" >> depends on ARCH_QCOM || COMPILE_TEST >> + depends on DRM || DRM=n >> help >> A Type-C port and Power Delivery driver which aggregates two >> discrete pieces of silicon in the PM8150b PMIC block: the >> diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c >> index a905160dd860..0722fb8d75c4 100644 >> --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c >> +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c >> @@ -17,6 +17,9 @@ >> #include <linux/usb/role.h> >> #include <linux/usb/tcpm.h> >> #include <linux/usb/typec_mux.h> >> + >> +#include <drm/drm_bridge.h> >> + >> #include "qcom_pmic_typec_pdphy.h" >> #include "qcom_pmic_typec_port.h" >> @@ -33,6 +36,9 @@ struct pmic_typec { >> struct pmic_typec_port *pmic_typec_port; >> bool vbus_enabled; >> struct mutex lock; /* VBUS state serialization */ >> +#ifdef CONFIG_DRM >> + struct drm_bridge bridge; >> +#endif > > IMO there's no reason to ifdef the structure. Its up to you if you want to change it nor not, I have no strong feelings about it. +1, there's no ifdefs in the drm_bridge.h header that would make this not compile Konrad > > Acked-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx> > > --- > bod