Skip to content

Commit bc551d7

Browse files
net147sravnborg
authored andcommitted
drm: bridge: dw-hdmi: Avoid resetting force in the detect function
It has been observed that resetting force in the detect function can result in the PHY being powered down in response to hot-plug detect being asserted, even when the HDMI connector is forced on. Enabling debug messages and adding a call to dump_stack() in dw_hdmi_phy_power_off() shows the following in dmesg: [ 160.637413] dwhdmi-rockchip ff940000.hdmi: EVENT=plugin [ 160.637433] dwhdmi-rockchip ff940000.hdmi: PHY powered down in 0 iterations Call trace: dw_hdmi_phy_power_off dw_hdmi_phy_disable dw_hdmi_update_power dw_hdmi_detect dw_hdmi_connector_detect drm_helper_probe_detect_ctx drm_helper_hpd_irq_event dw_hdmi_irq irq_thread_fn irq_thread kthread ret_from_fork Fixes: 381f05a ("drm: bridge/dw_hdmi: add connector mode forcing") Signed-off-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/20201031081747.372599-1-net147@gmail.com
1 parent a6c40b8 commit bc551d7

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2327,12 +2327,6 @@ static enum drm_connector_status dw_hdmi_detect(struct dw_hdmi *hdmi)
23272327
{
23282328
enum drm_connector_status result;
23292329

2330-
mutex_lock(&hdmi->mutex);
2331-
hdmi->force = DRM_FORCE_UNSPECIFIED;
2332-
dw_hdmi_update_power(hdmi);
2333-
dw_hdmi_update_phy_mask(hdmi);
2334-
mutex_unlock(&hdmi->mutex);
2335-
23362330
result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
23372331

23382332
mutex_lock(&hdmi->mutex);

0 commit comments

Comments
 (0)