diff options
| author | Lothar Waßmann <LW@KARO-electronics.de> | 2012-11-22 16:49:14 +0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-01-16 05:13:18 +0400 |
| commit | c69aab88b3a960f9d41a8d2c467eb61f613cbea7 (patch) | |
| tree | 4b5809f39464de24dd72562bf9158d035de3e8b9 /drivers/video | |
| parent | 55fa88bba3378e444ab8c2fe21f6f7e0046355a8 (diff) | |
| download | linux-c69aab88b3a960f9d41a8d2c467eb61f613cbea7.tar.xz | |
video: mxsfb: fix crash when unblanking the display
commit 6c1ecba8d84841277d68140ef485335d5be28485 upstream.
The VDCTRL4 register does not provide the MXS SET/CLR/TOGGLE feature.
The write in mxsfb_disable_controller() sets the data_cnt for the LCD
DMA to 0 which obviously means the max. count for the LCD DMA and
leads to overwriting arbitrary memory when the display is unblanked.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Juergen Beisert <jbe@pengutronix.de>
Tested-by: Lauri Hintsala <lauri.hintsala@bluegiga.net>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/mxsfb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index d837d63c456f..03cb95a3c1e4 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -366,7 +366,8 @@ static void mxsfb_disable_controller(struct fb_info *fb_info) loop--; } - writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR); + reg = readl(host->base + LCDC_VDCTRL4); + writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4); clk_disable(host->clk); |