Commit 8faff374 authored Sep 12, 2018 by Heiko Stuebner

drm/bridge: dw-hdmi: allow forcing vendor phy-type



In some IP implementations the reading of the phy-type may be broken.
One example are the Rockchip rk3228 and rk3328 socs that use a separate
vendor-type phy from Innosilicon but still report the HDMI20_TX type.

So allow the glue driver to force the vendor-phy for these cases.
In the future it may be necessary to allow forcing other types, but
for now we'll keep it simply to the case actually seen in the wild.

changes in v3:
- only allow forcing vendor type, as suggested by Laurent

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Zheng Yang <zhengyang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180912124740.20343-2-heiko@sntech.de
Link: https://patchwork.freedesktop.org/patch/msgid/20180912124740.20343-3-heiko@sntech.de

parent 53273b52

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2205,7 +2205,9 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi)
		unsigned int i;
		u8 phy_type;

		phy_type = hdmi_readb(hdmi, HDMI_CONFIG2_ID);
		phy_type = hdmi->plat_data->phy_force_vendor ?
		DW_HDMI_PHY_VENDOR_PHY :
		hdmi_readb(hdmi, HDMI_CONFIG2_ID);

		if (phy_type == DW_HDMI_PHY_VENDOR_PHY) {
		/* Vendor PHYs require support from the glue layer. */

include/drm/bridge/dw_hdmi.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,7 @@ struct dw_hdmi_plat_data {
		const struct dw_hdmi_phy_ops *phy_ops;
		const char *phy_name;
		void *phy_data;
		unsigned int phy_force_vendor;

		/* Synopsys PHY support */
		const struct dw_hdmi_mpll_config *mpll_cfg;

Admin message