Author: titmuss
Date: Fri Feb 8 08:37:40 2008
New Revision: 1867
URL: http://svn.slimdevices.com?rev=1867&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1861): titmuss | 2008-02-08 13:39:26 +0000
Bug: 6580
Description:
Save the framebuffer address registers during suspend/resume.
Modified:
trunk/ (props changed)
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.c
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.h
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Feb 8 08:37:40 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1857
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1861
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.c
URL:
http://svn.slimdevices.com/trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.c?rev=1867&root=Jive&r1=1866&r2=1867&view=diff
==============================================================================
--- trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.c
(original)
+++ trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.c
Fri Feb 8 08:37:40 2008
@@ -1153,8 +1153,12 @@
{
struct fb_info *fbinfo = platform_get_drvdata(dev);
struct s3c2410fb_info *info = fbinfo->par;
+ void __iomem *regs = info->io;
s3c2410fb_stop_lcd(info);
+
+ info->lcdsaddr1 = readl(regs + S3C2410_LCDSADDR1);
+ info->lcdsaddr2 = readl(regs + S3C2410_LCDSADDR2);
/* sleep before disabling the clock, we need to ensure
* the LCD DMA engine is not going to get back on the bus
@@ -1170,6 +1174,7 @@
{
struct fb_info *fbinfo = platform_get_drvdata(dev);
struct s3c2410fb_info *info = fbinfo->par;
+ void __iomem *regs = info->io;
clk_enable(info->clk);
msleep(1);
@@ -1178,6 +1183,10 @@
/* re-activate our display after resume */
s3c2410fb_activate_var(fbinfo);
+
+ writel(info->lcdsaddr1, regs + S3C2410_LCDSADDR1);
+ writel(info->lcdsaddr2, regs + S3C2410_LCDSADDR2);
+
s3c2410fb_blank(FB_BLANK_UNBLANK, fbinfo);
return 0;
Modified:
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.h
URL:
http://svn.slimdevices.com/trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.h?rev=1867&root=Jive&r1=1866&r2=1867&view=diff
==============================================================================
--- trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.h
(original)
+++ trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/video/s3c2410fb.h
Fri Feb 8 08:37:40 2008
@@ -48,6 +48,11 @@
struct notifier_block freq_transition;
#endif
+#ifdef CONFIG_PM
+ unsigned long lcdsaddr1;
+ unsigned long lcdsaddr2;
+#endif
+
/* keep these registers in case we need to re-write palette */
u32 palette_buffer[256];
u32 pseudo_pal[16];
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
