diff options
| author | Fabio Estevam <fabio.estevam@nxp.com> | 2017-06-28 18:33:55 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-07-26 14:57:28 -0300 |
| commit | 09845b886c1198c9461de424ffd95dde363324c1 (patch) | |
| tree | 0165a2f464be777cfe5d7164416e168cb36acead /drivers/video | |
| parent | 300a7650298b3334f356f36d30431ff8b6281237 (diff) | |
mxc_hdmi: Fix hang during boot
If HDMI has been in use by the bootloader or a previous
running kernel it hangs when HDMI cable is connected.
Move the enabling of overflow_into mxc_hdmi_setup() to fix this
issue.
Original patch is from Jon Nettleton based on a 3.10 kernel:
https://github.com/xbianonpi/xbian-package-kernel/blob/master/patches/imx6/hdmi-freeze.patch
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/mxc/mxc_hdmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/mxc/mxc_hdmi.c b/drivers/video/fbdev/mxc/mxc_hdmi.c index 513ab160129a..4e9648b2162e 100644 --- a/drivers/video/fbdev/mxc/mxc_hdmi.c +++ b/drivers/video/fbdev/mxc/mxc_hdmi.c @@ -1261,9 +1261,6 @@ static void mxc_hdmi_phy_init(struct mxc_hdmi *hdmi) || (hdmi->blank != FB_BLANK_UNBLANK)) return; - if (!hdmi->hdmi_data.video_mode.mDVI) - hdmi_enable_overflow_interrupts(); - /*check csc whether needed activated in HDMI mode */ cscon = (isColorSpaceConversion(hdmi) && !hdmi->hdmi_data.video_mode.mDVI); @@ -2253,6 +2250,9 @@ static void mxc_hdmi_setup(struct mxc_hdmi *hdmi, unsigned long event) mxc_hdmi_clear_overflow(hdmi); + if (!hdmi->hdmi_data.video_mode.mDVI) + hdmi_enable_overflow_interrupts(); + dev_dbg(&hdmi->pdev->dev, "%s exit\n\n", __func__); } |