From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Wed, 22 Feb 2017 13:40:22 +0000 (-0300)
Subject: video: mxsfb: Fix reset hang when videomode variable is not present
X-Git-Tag: v2017.03-rc3~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b24cf8540a85a9bf97975aadd6a7542f166c78a3;p=u-boot

video: mxsfb: Fix reset hang when videomode variable is not present

Currently the system hangs when the 'videomode' variable is not present
and a reset command is issued:

=> setenv videomode
=> saveenv
=> reset

(Board hangs)

lcdif_power_down() assumes that the LCDIF controller has been properly
configured and enabled, which may not be true.

To fix this issue check whether panel.frameAdrs has been initialized and
in case it has not been initialized, do not continue with the LCDIF
powerdown sequence.

Tested on a imx7dsabresd board.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
---

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 3cc03cadee..32ecbe2b09 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -136,6 +136,9 @@ void lcdif_power_down(void)
 	struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
 	int timeout = 1000000;
 
+	if (!panel.frameAdrs)
+		return;
+
 	writel(panel.frameAdrs, &regs->hw_lcdif_cur_buf_reg);
 	writel(panel.frameAdrs, &regs->hw_lcdif_next_buf_reg);
 	writel(LCDIF_CTRL1_VSYNC_EDGE_IRQ, &regs->hw_lcdif_ctrl1_clr);