| From daaa13e4d7c9028792b6b51ef2e147993c6e9c91 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Tue, 24 Apr 2012 02:10:05 -0700 |
| Subject: ARM: mach-shmobile: r8a7740: reserve DMA memory for the frame buffer |
| |
| The default 2MB size of DMA coherent memory isn't enough for allocate |
| frame buffer memory. |
| |
| N.B: Not present upstream yet |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-r8a7740.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c |
| index 74e5234..5d92def 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7740.c |
| @@ -18,6 +18,7 @@ |
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| */ |
| #include <linux/delay.h> |
| +#include <linux/dma-mapping.h> |
| #include <linux/kernel.h> |
| #include <linux/init.h> |
| #include <linux/io.h> |
| @@ -59,6 +60,12 @@ static struct map_desc r8a7740_io_desc[] __initdata = { |
| void __init r8a7740_map_io(void) |
| { |
| iotable_init(r8a7740_io_desc, ARRAY_SIZE(r8a7740_io_desc)); |
| + |
| + /* |
| + * DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't |
| + * enough to allocate the frame buffer memory. |
| + */ |
| + init_consistent_dma_size(12 << 20); |
| } |
| |
| /* SCIFA0 */ |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |
