diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-04-24 02:10:05 -0700 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-12 22:33:06 +0200 |
| commit | 3841e6f561af717478b253ce1dcba7bff9e9f890 (patch) | |
| tree | 29dda70fad9e760fba90a3027af13c027a261ef9 | |
| parent | 0a4266bb22774bb0b6390d2633a151d996a14e77 (diff) | |
| download | kernel_goldelico_gta04-3841e6f561af717478b253ce1dcba7bff9e9f890.zip kernel_goldelico_gta04-3841e6f561af717478b253ce1dcba7bff9e9f890.tar.gz kernel_goldelico_gta04-3841e6f561af717478b253ce1dcba7bff9e9f890.tar.bz2 | |
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.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Simon Horman <horms@verge.net.au>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7740.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 34a1548..ec4eb49 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> @@ -60,6 +61,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 */ |