atmel_lcdfb: don't initialize a pre-allocated framebuffer

If the user specified a fixed framebuffer address on the command line, it may
have been initialized already with a splash image or something, so we
shouldn't clear it.

Therefore, we should only initialize the framebuffer if we allocated it
ourselves.  This patch also updates the AVR32 setup code to clear the
framebuffer if it allocated it itself, i.e.  the user didn't provide a fixed
address or the reservation failed.

I've updated the at91 platform code as well so that it initializes the
framebuffer if it is located in SRAM, but I haven't tested that it actually
works.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Nicolas FERRE <nicolas.ferre@rfo.atmel.com>
Cc: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 37cd547855b1baa5dbd894b3942c35d5cebbd5cd..728bb8f394415fc683d3e8b4620cdaec984992a8 100644 (file)
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -539,6 +539,17 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
        at91_set_B_periph(AT91_PIN_PB28, 0);    /* LCDD23 */
 #endif
 
+       if (ARRAY_SIZE(lcdc_resources) > 2) {
+               void __iomem *fb;
+               struct resource *fb_res = &lcdc_resources[2];
+               size_t fb_len = fb_res->end - fb_res->start + 1;
+
+               fb = ioremap_writecombine(fb_res->start, fb_len);
+               if (fb) {
+                       memset(fb, 0, fb_len);
+                       iounmap(fb, fb_len);
+               }
+       }
        lcdc_data = *data;
        platform_device_register(&at91_lcdc_device);
 }

diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index dbb9a5fc2090250855daa02b7d6f65a9dfce7fe3..054689804e77571213012852f4dc771f5f70501e 100644 (file)
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -381,6 +381,20 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
        at91_set_B_periph(AT91_PIN_PC24, 0);    /* LCDD22 */
        at91_set_B_periph(AT91_PIN_PC25, 0);    /* LCDD23 */
 
+#ifdef CONFIG_FB_INTSRAM
+       {
+               void __iomem *fb;
+               struct resource *fb_res = &lcdc_resources[2];
+               size_t fb_len = fb_res->end - fb_res->start + 1;
+
+               fb = ioremap_writecombine(fb_res->start, fb_len);
+               if (fb) {
+                       memset(fb, 0, fb_len);
+                       iounmap(fb, fb_len);
+               }
+       }
+#endif
+
        lcdc_data = *data;
        platform_device_register(&at91_lcdc_device);
 }

diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index 2687b730e2d006a638492b303429cbcb767a313a..ce48c14f4349cfd3f18a1544397fd37588c6b888 100644 (file)
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -274,6 +274,8 @@ static int __init early_parse_fbmem(char *p)
                        printk(KERN_WARNING
                               "Failed to allocate framebuffer memory\n");
                        fbmem_size = 0;
+               } else {
+                       memset(__va(fbmem_start), 0, fbmem_size);
                }
        }
 

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index fc65c02306ddbd6c32c2be96b80fcd630be0258a..4d68b1b880d639b253108b2e20a35a9db6d93da9 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -250,6 +250,8 @@ static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
                return -ENOMEM;
        }
 
+       memset(info->screen_base, 0, info->fix.smem_len);
+
        return 0;
 }
 
@@ -634,7 +636,6 @@ static int __init atmel_lcdfb_init_fbinfo(struct atmel_lcdfb_info *sinfo)
        struct fb_info *info = sinfo->info;
        int ret = 0;
 
-       memset_io(info->screen_base, 0, info->fix.smem_len);
        info->var.activate |= FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW;
 
        dev_info(info->device,
@@ -764,6 +765,11 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
                if (!info->screen_base)
                        goto release_intmem;
+
+               /*
+                * Don't clear the framebuffer -- someone may have set
+                * up a splash image.
+                */
        } else {
                /* alocate memory buffer */
                ret = atmel_lcdfb_alloc_video_memory(sinfo);