| Message ID | 1387441388-10962-1-git-send-email-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2013-12-19 10:23, Sascha Hauer wrote: > 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 > --- > drivers/video/mx3fb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c > index cfdb380..c882bec 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", > Thanks, queued for 3.14. Tomi
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index cfdb380..c882bec 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",
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 --- drivers/video/mx3fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)