A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

atmel_lcdfb: don't initialize a pre-allocated framebuffer

Browse source 
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 <[email protected]>
Cc: "Antonino A. Daplas" <[email protected]>
Cc: Nicolas FERRE <[email protected]>
Cc: Andrew Victor <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Haavard Skinnemoen 2008-04-28 02:15:19 -07:00 • committed by Linus Torvalds
commit 01d3a5e7fa
4 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/video/atmel_lcdfb.c
View file

@ -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);