diff options
| author | Thomas Niederprüm <niederp@physik.uni-kl.de> | 2015-03-31 20:27:08 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-05-27 12:53:21 +0300 |
| commit | facd94bc458af12e1ebab06cfc3b8e7a41906622 (patch) | |
| tree | e4f173632c95076511b3216bb1b8e82b448ef244 /drivers/video/fbdev/ssd1307fb.c | |
| parent | 258c0ea21d3aa974b43e5ce6c2f7c94553a3b1cc (diff) | |
| download | linux-facd94bc458af12e1ebab06cfc3b8e7a41906622.tar.gz linux-facd94bc458af12e1ebab06cfc3b8e7a41906622.tar.bz2 linux-facd94bc458af12e1ebab06cfc3b8e7a41906622.zip | |
fbdev: ssd1307fb: Allocate page aligned video memory.
Currently the videomemory is allocated by kmalloc, making it a memory
region that is not necessarily page aligend. This leads to problems
upon mmap call, where the video memory's address gets aligned to the
next page boundary. The result is that the userspace program that issued
the mmap call is not able to access the video memory from the start to
the next page boundary.
This patch changes the allocation of the video memory to use
__get_free_pages() in order to obtain memory that is aligned
to page boundaries.
Signed-off-by: Thomas Niederprüm <niederp@physik.uni-kl.de>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev/ssd1307fb.c')
| -rw-r--r-- | drivers/video/fbdev/ssd1307fb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index 61e0ce866506..8d34c5651187 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -489,7 +489,8 @@ 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 = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, + get_order(vmem_size)); if (!vmem) { dev_err(&client->dev, "Couldn't allocate graphical memory.\n"); ret = -ENOMEM; @@ -573,6 +574,7 @@ static int ssd1307fb_remove(struct i2c_client *client) if (par->ops->remove) par->ops->remove(par); fb_deferred_io_cleanup(info); + __free_pages(__va(info->fix.smem_start), get_order(info->fix.smem_len)); framebuffer_release(info); return 0; |