From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754177AbbCIWT2 (ORCPT ); Mon, 9 Mar 2015 18:19:28 -0400 Received: from mailgw1.uni-kl.de ([131.246.120.220]:51689 "EHLO mailgw1.uni-kl.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752781AbbCIWTY (ORCPT ); Mon, 9 Mar 2015 18:19:24 -0400 From: =?UTF-8?q?Thomas=20Niederpr=C3=BCm?= To: plagnioj@jcrosoft.com, tomi.valkeinen@ti.com, maxime.ripard@free-electrons.com, kernel@pengutronix.de, shawn.guo@linaro.org, robh+dt@kernel.org Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Thomas=20Niederpr=C3=BCm?= Subject: [PATCHv3 02/10] fbdev: ssd1307fb: Use vmalloc to allocate video memory. Date: Mon, 9 Mar 2015 23:22:04 +0100 Message-Id: <1425939732-18386-3-git-send-email-niederp@physik.uni-kl.de> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1425939732-18386-1-git-send-email-niederp@physik.uni-kl.de> References: <1423261694-5939-1-git-send-email-niederp@physik.uni-kl.de> <1425939732-18386-1-git-send-email-niederp@physik.uni-kl.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It makes sense to use vmalloc to allocate the video buffer since it has to be page aligned memory for using it with mmap. Also deffered io seems buggy in combination with kmalloc'ed memory (crash on unloading the module). Signed-off-by: Thomas Niederprüm --- drivers/video/fbdev/ssd1307fb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index 61e0ce8..310474a 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -489,7 +490,7 @@ static int ssd1307fb_probe(struct i2c_client *client, vmem_size = par->width * par->height / 8; - vmem = devm_kzalloc(&client->dev, vmem_size, GFP_KERNEL); + vmem = vzalloc(vmem_size); if (!vmem) { dev_err(&client->dev, "Couldn't allocate graphical memory.\n"); ret = -ENOMEM; @@ -559,6 +560,7 @@ panel_init_error: par->ops->remove(par); reset_oled_error: fb_deferred_io_cleanup(info); + vfree(vmem); fb_alloc_error: framebuffer_release(info); return ret; @@ -573,6 +575,7 @@ static int ssd1307fb_remove(struct i2c_client *client) if (par->ops->remove) par->ops->remove(par); fb_deferred_io_cleanup(info); + vfree(__va(info->fix.smem_start)); framebuffer_release(info); return 0; -- 2.3.0