fbdev: don't pass a NULL struct device to DMA API functions v2
We still have a few drivers which pass a NULL struct device pointer to DMA API functions, which generally is a bad idea as the API implementations rely on the device not only for ops selection, but also the dma mask and various other attributes.
This series contains all easy conversions to pass a struct device, besides that there also is some arch code that needs separate handling, a driver that should not use the DMA API at all, and one that is a complete basket case to be deal with separately.
Changes since v1:
- split the series, this only contains the fbdev patches
PATCH 1/3 da8xx-fb: pass struct device to DMA API functions
The DMA API generally relies on a struct device to work properly, and only barely works without one for legacy reasons. Pass the easily available struct device from the platform_device to remedy this.
--- drivers/video/fbdev/da8xx-fb.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/video/fbdev/da8xx-fb.c +7 -6
@@ -1097,9 +1097,9 @@ static int fb_remove(struct platform_device *dev)unregister_framebuffer (info);fb_dealloc_cmap (&info->cmap); -dma_free_coherent (NULL ,PALETTE_SIZE , par->v_palette_base, +dma_free_coherent (par->dev,PALETTE_SIZE , par->v_palette_base, par->p_palette_base); -dma_free_coherent (NULL , par->vram_size, par->vram_virt, +dma_free_coherent (par->dev, par->vram_size, par->vram_virt, par->vram_phys);pm_runtime_put_sync (&dev->dev);pm_runtime_disable (&dev->dev);
@@ -1425,7 +1425,7 @@ static int fb_probe(struct platform_device *device) par->vram_size =roundup (par->vram_size/8 , ulcm); par->vram_size = par->vram_size *LCD_NUM_BUFFERS ; - par->vram_virt =dma_alloc_coherent (NULL , + par->vram_virt =dma_alloc_coherent (par->dev, par->vram_size, &par->vram_phys,GFP_KERNEL |GFP_DMA );
@@ -1446,7 +1446,7 @@ static int fb_probe(struct platform_device *device) da8xx_fb_fix.line_length -1 ;/* allocate palette buffer */ - par->v_palette_base =dma_alloc_coherent (NULL ,PALETTE_SIZE , + par->v_palette_base =dma_alloc_coherent (par->dev,PALETTE_SIZE , &par->p_palette_base,GFP_KERNEL |GFP_DMA );if (!par->v_palette_base) {
@@ -1532,11 +1532,12 @@ static int fb_probe(struct platform_device *device)fb_dealloc_cmap (&da8xx_fb_info->cmap); err_release_pl_mem: -dma_free_coherent (NULL ,PALETTE_SIZE , par->v_palette_base, +dma_free_coherent (par->dev,PALETTE_SIZE , par->v_palette_base, par->p_palette_base); err_release_fb_mem: -dma_free_coherent (NULL , par->vram_size, par->vram_virt, par->vram_phys); +dma_free_coherent (par->dev, par->vram_size, par->vram_virt, + par->vram_phys); err_release_fb:framebuffer_release (da8xx_fb_info);
Signature · 1 line
2.20.1
PATCH 2/3 gbefb: switch to managed version of the DMA allocator
In reply to Christoph Hellwiggbefb uses managed resources, so it should do the same for DMA allocations.
--- drivers/video/fbdev/gbefb.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/video/fbdev/gbefb.c +8 -16
@@ -1162,9 +1162,9 @@ static int gbefb_probe(struct platform_device *p_dev) } gbe_revision = gbe->ctrlstat &15 ; - gbe_tiles.cpu = -dma_alloc_coherent (NULL ,GBE_TLB_SIZE *sizeof (uint16_t ), - &gbe_tiles.dma,GFP_KERNEL ); + gbe_tiles.cpu =dmam_alloc_coherent (&p_dev->dev, +GBE_TLB_SIZE *sizeof (uint16_t ), + &gbe_tiles.dma,GFP_KERNEL );if (!gbe_tiles.cpu) {printk (KERN_ERR "gbefb: couldn't allocate tiles table\n" ); ret = -ENOMEM ;
@@ -1178,19 +1178,20 @@ static int gbefb_probe(struct platform_device *p_dev)if (!gbe_mem) {printk (KERN_ERR "gbefb: couldn't map framebuffer\n" ); ret = -ENOMEM ; - goto out_tiles_free; + goto out_release_mem_region; } gbe_dma_addr =0 ; }else {/* try to allocate memory with the classical allocator * this has high chance to fail on low memory machines */ - gbe_mem =dma_alloc_wc (NULL , gbe_mem_size, &gbe_dma_addr, -GFP_KERNEL ); + gbe_mem =dmam_alloc_attrs (&p_dev->dev, gbe_mem_size, + &gbe_dma_addr,GFP_KERNEL , +DMA_ATTR_WRITE_COMBINE );if (!gbe_mem) {printk (KERN_ERR "gbefb: couldn't allocate framebuffer memory\n" ); ret = -ENOMEM ; - goto out_tiles_free; + goto out_release_mem_region; } gbe_mem_phys = (unsigned long ) gbe_dma_addr;
@@ -1237,11 +1238,6 @@ static int gbefb_probe(struct platform_device *p_dev) out_gbe_unmap:arch_phys_wc_del (par->wc_cookie); -if (gbe_dma_addr) -dma_free_wc (NULL , gbe_mem_size, gbe_mem, gbe_mem_phys); -out_tiles_free: -dma_free_coherent (NULL ,GBE_TLB_SIZE *sizeof (uint16_t ), - (void *)gbe_tiles.cpu, gbe_tiles.dma); out_release_mem_region:release_mem_region (GBE_BASE ,sizeof (struct sgi_gbe )); out_release_framebuffer:
@@ -1258,10 +1254,6 @@ static int gbefb_remove(struct platform_device* p_dev)unregister_framebuffer (info);gbe_turn_off ();arch_phys_wc_del (par->wc_cookie); -if (gbe_dma_addr) -dma_free_wc (NULL , gbe_mem_size, gbe_mem, gbe_mem_phys); -dma_free_coherent (NULL ,GBE_TLB_SIZE *sizeof (uint16_t ), - (void *)gbe_tiles.cpu, gbe_tiles.dma);release_mem_region (GBE_BASE ,sizeof (struct sgi_gbe ));gbefb_remove_sysfs (&p_dev->dev);framebuffer_release (info);
Signature · 1 line
2.20.1
PATCH 3/3 pxa3xx-gcu: pass struct device to dma_mmap_coherent
In reply to Christoph HellwigJust like we do for all other DMA operations.
--- drivers/video/fbdev/pxa3xx-gcu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/video/fbdev/pxa3xx-gcu.c +3 -1
@@ -96,6 +96,7 @@ struct pxa3xx_gcu_batch { };struct pxa3xx_gcu_priv { +struct device *dev;void __iomem *mmio_base;struct clk *clk;struct pxa3xx_gcu_shared *shared;
@@ -493,7 +494,7 @@ pxa3xx_gcu_mmap(struct file *file, struct vm_area_struct *vma)if (size !=SHARED_SIZE )return -EINVAL ; -return dma_mmap_coherent (NULL , vma, +return dma_mmap_coherent (priv->dev, vma, priv->shared, priv->shared_phys, size);case SHARED_SIZE >>PAGE_SHIFT :
@@ -670,6 +671,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)platform_set_drvdata (pdev, priv); priv->resource_mem = r; + priv->dev = dev;pxa3xx_gcu_reset (priv);pxa3xx_gcu_init_debug_timer (priv);
Signature · 1 line
2.20.1