AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Merge branch 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus

Browse Source 
* 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: OMAPFB: disable old omapfb for OMAP4 builds
  OMAP: DSS: VRAM: Align start & size of vram to 2M
This commit is contained in:
Paul Mundt 2010-12-16 23:38:41 +09:00
commit e13416ae7f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/omap/Kconfig
View File

@ -1,7 +1,7 @@
config FB_OMAP config FB_OMAP
tristate "OMAP frame buffer support (EXPERIMENTAL)" tristate "OMAP frame buffer support (EXPERIMENTAL)"
depends on FB && ARCH_OMAP && (OMAP2_DSS = "n") depends on FB && (OMAP2_DSS = "n")
depends on ARCH_OMAP1 || ARCH_OMAP2 || ARCH_OMAP3
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT

4
drivers/video/omap2/vram.c
View File

@ -551,7 +551,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
if (!size) if (!size)
return; return;
size = PAGE_ALIGN(size); size = ALIGN(size, SZ_2M);
if (paddr) { if (paddr) {
if (paddr & ~PAGE_MASK) { if (paddr & ~PAGE_MASK) {
@ -576,7 +576,7 @@ void __init omap_vram_reserve_sdram_memblock(void)
return; return;
} }
} else { } else {
paddr = memblock_alloc(size, PAGE_SIZE); paddr = memblock_alloc(size, SZ_2M);
} }
memblock_free(paddr, size); memblock_free(paddr, size);