Am Mittwoch, den 27.07.2016, 16:31 +0800 schrieb Bibby Hsieh: > From: Junzhi Zhao <junzhi.zhao@xxxxxxxxxxxx> > > The mtk_hdmi_send_infoframe have to > be run after PLL and PIXEL clock of HDMI enable. > Make sure that HDMI inforframes can be sent > successfully. > > Signed-off-by: Junzhi Zhao <junzhi.zhao@xxxxxxxxxxxx> > Signed-off-by: Bibby Hsieh <bibby.hsieh@xxxxxxxxxxxx> > --- > drivers/gpu/drm/mediatek/mtk_hdmi.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index ba812ef..d8609f5 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -1133,12 +1133,6 @@ static int mtk_hdmi_output_set_display_mode(struct mtk_hdmi *hdmi, > phy_power_on(hdmi->phy); > mtk_hdmi_aud_output_config(hdmi, mode); > > - mtk_hdmi_setup_audio_infoframe(hdmi); > - mtk_hdmi_setup_avi_infoframe(hdmi, mode); > - mtk_hdmi_setup_spd_infoframe(hdmi, "mediatek", "On-chip HDMI"); > - if (mode->flags & DRM_MODE_FLAG_3D_MASK) > - mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode); > - > mtk_hdmi_hw_vid_black(hdmi, false); > mtk_hdmi_hw_aud_unmute(hdmi); > mtk_hdmi_hw_send_av_unmute(hdmi); > @@ -1401,14 +1395,25 @@ static void mtk_hdmi_bridge_pre_enable(struct drm_bridge *bridge) > hdmi->powered = true; > } > > +static void mtk_hdmi_send_infoframe(struct mtk_hdmi *hdmi, > + struct drm_display_mode *mode) > +{ > + mtk_hdmi_setup_audio_infoframe(hdmi); > + mtk_hdmi_setup_avi_infoframe(hdmi, mode); > + mtk_hdmi_setup_spd_infoframe(hdmi, "mediatek", "On-chip HDMI"); > + if (mode->flags & DRM_MODE_FLAG_3D_MASK) > + mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode); > +} > + > static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge) > { > struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge); > > + phy_power_on(hdmi->phy); > mtk_hdmi_output_set_display_mode(hdmi, &hdmi->mode); > clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL]); > clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PIXEL]); > - phy_power_on(hdmi->phy); This change is not described in the patch description. Why is the phy power on moved after the pixel clock enable? > + mtk_hdmi_send_infoframe(hdmi, &hdmi->mode); > > hdmi->enabled = true; > } regards Philipp _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel