diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-19 09:23:08 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-17 09:57:44 +0100 |
| commit | 4d32d0476906e1451cbcb91e88320134a4b890b7 (patch) | |
| tree | b88e43c8803ee6748dc200079bf6b04448559014 /drivers/video/mx3fb.c | |
| parent | fbcon: Fix memory leak in fbcon_exit(). (diff) | |
| download | linux-4d32d0476906e1451cbcb91e88320134a4b890b7.tar.xz linux-4d32d0476906e1451cbcb91e88320134a4b890b7.zip | |
video: mx3fb: Allow blocking during framebuffer allocation
No need to allocate the framebuffer from the atomic pool, we are not
in interrupt context. Adding GFP_KERNEL to the framebuffer allocation
allows to use the much bigger CMA pool to allocate the framebuffer.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/mx3fb.c')
| -rw-r--r-- | drivers/video/mx3fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 804f874d32d3..142e860fb527 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -1263,7 +1263,7 @@ static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len, fbi->screen_base = dma_alloc_writecombine(fbi->device, mem_len, - &addr, GFP_DMA); + &addr, GFP_DMA | GFP_KERNEL); if (!fbi->screen_base) { dev_err(fbi->device, "Cannot allocate %u bytes framebuffer memory\n", |