github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm: bridge: synopsys: update mc_clkdis in dw_hdmi_bind

Browse Source 
If vop return error when showing kernel logo, connector atomic flush
will not be call, and mc_clkdis can not be updated.

This patch update mc_clkdis in the dw_hdmi_bind, when phy clock is
locked and HPD is connected.

Change-Id: I1498d787a993961fe75236c309ecc3c898d611a4
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang 2018-01-31 18:16:12 +08:00 committed by Tao Huang
parent 8ebe023800
commit 3a61ef4874
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
View File

@ -2650,7 +2650,6 @@ dw_hdmi_connector_atomic_flush(struct drm_connector *connector,
if (hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_out_bus_format))
vmode->mtmdsclock /= 2;
hdmi->mc_clkdis = hdmi_readb(hdmi, HDMI_MC_CLKDIS);
hdmi->phy.enabled = true;
hdmi->bridge_is_on = true;
if (in_bus_format != hdmi->hdmi_data.enc_in_bus_format ||
@ -3599,6 +3598,9 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
prod_id1 & HDMI_PRODUCT_ID1_HDCP ? "with" : "without",
hdmi->phy.name);
ret = hdmi_readb(hdmi, HDMI_PHY_STAT0);
if (ret & (HDMI_PHY_TX_PHY_LOCK | HDMI_PHY_HPD))
hdmi->mc_clkdis = hdmi_readb(hdmi, HDMI_MC_CLKDIS);
init_hpd_work(hdmi);
initialize_hdmi_ih_mutes(hdmi);