Commit 671da5f3 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori

fbdev: da8xx: use resource management for dma

Use managed variants of dma alloc functions in the da8xx fbdev driver.
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 8a3665f7
...@@ -1087,10 +1087,6 @@ static int fb_remove(struct platform_device *dev) ...@@ -1087,10 +1087,6 @@ static int fb_remove(struct platform_device *dev)
unregister_framebuffer(info); unregister_framebuffer(info);
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
dma_free_coherent(par->dev, PALETTE_SIZE, par->v_palette_base,
par->p_palette_base);
dma_free_coherent(par->dev, par->vram_size, par->vram_virt,
par->vram_phys);
pm_runtime_put_sync(&dev->dev); pm_runtime_put_sync(&dev->dev);
pm_runtime_disable(&dev->dev); pm_runtime_disable(&dev->dev);
framebuffer_release(info); framebuffer_release(info);
...@@ -1427,10 +1423,10 @@ static int fb_probe(struct platform_device *device) ...@@ -1427,10 +1423,10 @@ static int fb_probe(struct platform_device *device)
par->vram_size = roundup(par->vram_size/8, ulcm); par->vram_size = roundup(par->vram_size/8, ulcm);
par->vram_size = par->vram_size * LCD_NUM_BUFFERS; par->vram_size = par->vram_size * LCD_NUM_BUFFERS;
par->vram_virt = dma_alloc_coherent(par->dev, par->vram_virt = dmam_alloc_coherent(par->dev,
par->vram_size, par->vram_size,
&par->vram_phys, &par->vram_phys,
GFP_KERNEL | GFP_DMA); GFP_KERNEL | GFP_DMA);
if (!par->vram_virt) { if (!par->vram_virt) {
dev_err(&device->dev, dev_err(&device->dev,
"GLCD: kmalloc for frame buffer failed\n"); "GLCD: kmalloc for frame buffer failed\n");
...@@ -1448,20 +1444,20 @@ static int fb_probe(struct platform_device *device) ...@@ -1448,20 +1444,20 @@ static int fb_probe(struct platform_device *device)
da8xx_fb_fix.line_length - 1; da8xx_fb_fix.line_length - 1;
/* allocate palette buffer */ /* allocate palette buffer */
par->v_palette_base = dma_alloc_coherent(par->dev, PALETTE_SIZE, par->v_palette_base = dmam_alloc_coherent(par->dev, PALETTE_SIZE,
&par->p_palette_base, &par->p_palette_base,
GFP_KERNEL | GFP_DMA); GFP_KERNEL | GFP_DMA);
if (!par->v_palette_base) { if (!par->v_palette_base) {
dev_err(&device->dev, dev_err(&device->dev,
"GLCD: kmalloc for palette buffer failed\n"); "GLCD: kmalloc for palette buffer failed\n");
ret = -EINVAL; ret = -EINVAL;
goto err_release_fb_mem; goto err_release_fb;
} }
par->irq = platform_get_irq(device, 0); par->irq = platform_get_irq(device, 0);
if (par->irq < 0) { if (par->irq < 0) {
ret = -ENOENT; ret = -ENOENT;
goto err_release_pl_mem; goto err_release_fb;
} }
da8xx_fb_var.grayscale = da8xx_fb_var.grayscale =
...@@ -1479,7 +1475,7 @@ static int fb_probe(struct platform_device *device) ...@@ -1479,7 +1475,7 @@ static int fb_probe(struct platform_device *device)
ret = fb_alloc_cmap(&da8xx_fb_info->cmap, PALETTE_SIZE, 0); ret = fb_alloc_cmap(&da8xx_fb_info->cmap, PALETTE_SIZE, 0);
if (ret) if (ret)
goto err_release_pl_mem; goto err_release_fb;
da8xx_fb_info->cmap.len = par->palette_sz; da8xx_fb_info->cmap.len = par->palette_sz;
/* initialize var_screeninfo */ /* initialize var_screeninfo */
...@@ -1533,14 +1529,6 @@ static int fb_probe(struct platform_device *device) ...@@ -1533,14 +1529,6 @@ static int fb_probe(struct platform_device *device)
err_dealloc_cmap: err_dealloc_cmap:
fb_dealloc_cmap(&da8xx_fb_info->cmap); fb_dealloc_cmap(&da8xx_fb_info->cmap);
err_release_pl_mem:
dma_free_coherent(par->dev, PALETTE_SIZE, par->v_palette_base,
par->p_palette_base);
err_release_fb_mem:
dma_free_coherent(par->dev, par->vram_size, par->vram_virt,
par->vram_phys);
err_release_fb: err_release_fb:
framebuffer_release(da8xx_fb_info); framebuffer_release(da8xx_fb_info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment