Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88abf44d authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Paul Mundt
Browse files

OMAP: VRAM: Fix boot-time memory allocation



Use memblock_free() and memblock_remove() to remove the allocated or
reserved VRAM area from normal kernel memory.

This is a slightly modified version of patches from Felipe Contreras and
Namhyung Kim.

Reported-by: default avatarFelipe Contreras <felipe.contreras@gmail.com>
Reported-by: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 108409a8
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -576,9 +576,12 @@ void __init omap_vram_reserve_sdram_memblock(void)
			return;
		}
	} else {
		paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT);
		paddr = memblock_alloc(size, PAGE_SIZE);
	}

	memblock_free(paddr, size);
	memblock_remove(paddr, size);

	omap_vram_add_region(paddr, size);

	pr_info("Reserving %u bytes SDRAM for VRAM\n", size);