From: Sascha Hauer Date: Thu, 19 Dec 2013 08:23:08 +0000 (+0100) Subject: video: mx3fb: Allow blocking during framebuffer allocation X-Git-Tag: v3.14-rc1~105^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d32d0476906e1451cbcb91e88320134a4b890b7;p=thirdparty%2Fkernel%2Flinux.git 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 Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 804f874d32d38..142e860fb527b 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",