Commit e13416ae authored by Paul Mundt's avatar Paul Mundt

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

* '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
parents b0c3844d b99ddbf8
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
......
...@@ -551,7 +551,7 @@ void __init omap_vram_reserve_sdram_memblock(void) ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment