FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-22 05:16:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] s3c2410fb: Fix resume

Browse Source 
regs.lcdcon1 was not updated on suspend.  The result was a garbaged display on
resume.  This bug was first noticed by Christer Weinigel.  This patch is a
modified version of the one he sent to me.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Arnaud Patard 2006-06-26 00:26:45 -07:00 committed by Linus Torvalds
parent c72755b3bd
commit 6931a764e1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/video/s3c2410fb.c
View File

@ -641,6 +641,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
int ret; int ret;
int irq; int irq;
int i; int i;
u32 lcdcon1;
mach_info = pdev->dev.platform_data; mach_info = pdev->dev.platform_data;
if (mach_info == NULL) { if (mach_info == NULL) {
@ -672,6 +673,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
memcpy(&info->regs, &mach_info->regs, sizeof(info->regs)); memcpy(&info->regs, &mach_info->regs, sizeof(info->regs));
/* Stop the video and unset ENVID if set */
info->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
lcdcon1 = readl(S3C2410_LCDCON1);
writel(lcdcon1 & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);
info->mach_info = pdev->dev.platform_data; info->mach_info = pdev->dev.platform_data;
fbinfo->fix.type = FB_TYPE_PACKED_PIXELS; fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
@ -794,15 +800,14 @@ dealloc_fb:
* shutdown the lcd controller * shutdown the lcd controller
*/ */
static void s3c2410fb_stop_lcd(void) static void s3c2410fb_stop_lcd(struct s3c2410fb_info *fbi)
{ {
unsigned long flags; unsigned long flags;
unsigned long tmp;
local_irq_save(flags); local_irq_save(flags);
tmp = readl(S3C2410_LCDCON1); fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
writel(tmp & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1); writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
local_irq_restore(flags); local_irq_restore(flags);
} }
@ -816,7 +821,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)
struct s3c2410fb_info *info = fbinfo->par; struct s3c2410fb_info *info = fbinfo->par;
int irq; int irq;
s3c2410fb_stop_lcd(); s3c2410fb_stop_lcd(info);
msleep(1); msleep(1);
s3c2410fb_unmap_video_memory(info); s3c2410fb_unmap_video_memory(info);
@ -844,7 +849,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
struct fb_info *fbinfo = platform_get_drvdata(dev); struct fb_info *fbinfo = platform_get_drvdata(dev);
struct s3c2410fb_info *info = fbinfo->par; struct s3c2410fb_info *info = fbinfo->par;
s3c2410fb_stop_lcd(); s3c2410fb_stop_lcd(info);
/* sleep before disabling the clock, we need to ensure /* sleep before disabling the clock, we need to ensure
* the LCD DMA engine is not going to get back on the bus * the LCD DMA engine is not going to get back on the bus