drm/bridge: dw-hdmi: allow overriding of phy-type reading

A patch from »drm/rockchip: hdmi support for rk3328« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko@...> Date: Sun, 10 Dec 2017 22:24:28 +0100

Commit-Message

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 phy from Innosilicon but still report the HDMI20_TX type. So allow the glue driver to force a specific type, like the vendor-phy for these cases. Signed-off-by: Heiko Stuebner <heiko@...>

Patch-Comment

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 +++- include/drm/bridge/dw_hdmi.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)

Statistics

  • 4 lines added
  • 1 lines removed

Changes

------------------ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -------------------
index f9802399cc0d..50d231626c4d 100644
@@ -2218,7 +2218,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_type) ?
+ hdmi->plat_data->phy_force_type :
+ 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 -------------------------
index dd2a8cf7d20b..3c1dddb09b95 100644
@@ -133,6 +133,7 @@ struct dw_hdmi_plat_data {
const struct dw_hdmi_phy_ops *phy_ops;
const char *phy_name;
void *phy_data;
+ u8 phy_force_type;
/* Synopsys PHY support */
const struct dw_hdmi_mpll_config *mpll_cfg;
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...