dma-mapping: remove dma_{alloc,free,mmap}_writecombine
Subsystems (4)
PATCH 1/1 dma-mapping: remove dma_{alloc,free,mmap}_writecombine
We can already use DMA_ATTR_WRITE_COMBINE or the _wc prefixed version, so remove the third way of doing things.
--- drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +++++------ include/linux/dma-mapping.h | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-)
drivers/gpu/drm/omapdrm/dss/dispc.c +5 -6
@@ -4609,11 +4609,10 @@ static int dispc_errata_i734_wa_init(struct dispc_device *dispc) i734_buf.size = i734.ovli.width * i734.ovli.height *color_mode_to_bpp (i734.ovli.fourcc) /8 ; - i734_buf.vaddr =dma_alloc_writecombine (&dispc->pdev->dev, - i734_buf.size, &i734_buf.paddr, -GFP_KERNEL ); + i734_buf.vaddr =dma_alloc_wc (&dispc->pdev->dev, i734_buf.size, + &i734_buf.paddr,GFP_KERNEL );if (!i734_buf.vaddr) { -dev_err (&dispc->pdev->dev,"%s: dma_alloc_writecombine failed\n" , +dev_err (&dispc->pdev->dev,"%s: dma_alloc_wc failed\n" , __func__);return -ENOMEM ; }
@@ -4626,8 +4625,8 @@ static void dispc_errata_i734_wa_fini(struct dispc_device *dispc)if (!dispc->feat->has_gamma_i734_bug)return ; -dma_free_writecombine (&dispc->pdev->dev, i734_buf.size, i734_buf.vaddr, - i734_buf.paddr); +dma_free_wc (&dispc->pdev->dev, i734_buf.size, i734_buf.vaddr, + i734_buf.paddr); }static void dispc_errata_i734_wa (struct dispc_device *dispc)
include/linux/dma-mapping.h +0 -9
@@ -786,9 +786,6 @@ static inline void *dma_alloc_wc(struct device *dev, size_t size,return dma_alloc_attrs (dev, size, dma_addr, gfp, attrs); } -#ifndef dma_alloc_writecombine -#define dma_alloc_writecombine dma_alloc_wc -#endif static inline void dma_free_wc (struct device *dev,size_t size,void *cpu_addr,dma_addr_t dma_addr)
@@ -796,9 +793,6 @@ static inline void dma_free_wc(struct device *dev, size_t size,return dma_free_attrs (dev, size, cpu_addr, dma_addr,DMA_ATTR_WRITE_COMBINE ); } -#ifndef dma_free_writecombine -#define dma_free_writecombine dma_free_wc -#endif static inline int dma_mmap_wc(struct device *dev, struct vm_area_struct *vma,
@@ -808,9 +802,6 @@ static inline int dma_mmap_wc(struct device *dev,return dma_mmap_attrs (dev, vma, cpu_addr, dma_addr, size,DMA_ATTR_WRITE_COMBINE ); } -#ifndef dma_mmap_writecombine -#define dma_mmap_writecombine dma_mmap_wc -#endif #ifdef CONFIG_NEED_DMA_MAP_STATE #define DEFINE_DMA_UNMAP_ADDR (ADDR_NAME ) dma_addr_t ADDR_NAME
Signature · 1 line
2.20.1
Quoted 8 lines · Christoph Hellwig
We can already use
DMA_ATTR_WRITE_COMBINEor the_wcprefixed version, so remove the third way of doing things.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +++++------ include/linux/dma-mapping.h | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-)
Which tree should this be applied to?
Tomi
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Tomi Valkeinen
Quoted 8 lines · Christoph Hellwig
We can already use
DMA_ATTR_WRITE_COMBINEor the_wcprefixed version, so remove the third way of doing things.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +++++------ include/linux/dma-mapping.h | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-)
Quoted 3 lines
Reviewed-by Tomi Valkeinen <[email protected]>Which tree should this be applied to?
I'd like to add it to the dma-mapping tree if possible.
Quoted 11 lines · Christoph Hellwig
Quoted 10 lines · Tomi Valkeinen
Quoted 8 lines · Christoph Hellwig
We can already use
DMA_ATTR_WRITE_COMBINEor the_wcprefixed version, so remove the third way of doing things.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +++++------ include/linux/dma-mapping.h | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-)
Quoted 5 lines
Quoted 3 lines
Reviewed-by Tomi Valkeinen <[email protected]>Which tree should this be applied to?
I'd like to add it to the dma-mapping tree if possible.
That's ok for me.
Tomi
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Christoph,
Thank you for the patch.
Quoted 14 lines · Christoph Hellwig
We can already use
DMA_ATTR_WRITE_COMBINEor the_wcprefixed version, so remove the third way of doing things.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +++++------ include/linux/dma-mapping.h | 9 --------- 2 files changed, 5 insertions(+), 15 deletions(-)drivers/gpu/drm/omapdrm/dss/dispc.c +0
-0
drivers/gpu/drm/omapdrm/dss/dispc.c static int dispc_errata_i734_wa_init(struct dispc_device *dispc) · line 4613
Quoted 8 lines
drivers/gpu/drm/omapdrm/dss/dispc.c +2
-3@@ -4609,11 +4609,10 @@ static int dispc_errata_i734_wa_init(struct dispc_device *dispc) i734_buf.size = i734.ovli.width * i734.ovli.height *color_mode_to_bpp (i734.ovli.fourcc) /8 ; - i734_buf.vaddr =dma_alloc_writecombine (&dispc->pdev->dev, - i734_buf.size, &i734_buf.paddr, -GFP_KERNEL ); + i734_buf.vaddr =dma_alloc_wc (&dispc->pdev->dev, i734_buf.size, + &i734_buf.paddr,GFP_KERNEL );
I would have indented this line to match the rest. Apart from that,
Quoted 51 lines
drivers/gpu/drm/omapdrm/dss/dispc.c +3
-3if (!i734_buf.vaddr) { -dev_err (&dispc->pdev->dev,"%s: dma_alloc_writecombine failed\n" , +dev_err (&dispc->pdev->dev,"%s: dma_alloc_wc failed\n" , __func__);return -ENOMEM ; }@@ -4626,8 +4625,8 @@ static void dispc_errata_i734_wa_fini(struct dispc_device *dispc)if (!dispc->feat->has_gamma_i734_bug)return ; -dma_free_writecombine (&dispc->pdev->dev, i734_buf.size, i734_buf.vaddr, - i734_buf.paddr); +dma_free_wc (&dispc->pdev->dev, i734_buf.size, i734_buf.vaddr, + i734_buf.paddr); }static void dispc_errata_i734_wa (struct dispc_device *dispc)include/linux/dma-mapping.h +0
-9@@ -786,9 +786,6 @@ static inline void *dma_alloc_wc(struct device *dev, size_t size,return dma_alloc_attrs (dev, size, dma_addr, gfp, attrs); } -#ifndef dma_alloc_writecombine -#define dma_alloc_writecombine dma_alloc_wc -#endif static inline void dma_free_wc (struct device *dev,size_t size,void *cpu_addr,dma_addr_t dma_addr)@@ -796,9 +793,6 @@ static inline void dma_free_wc(struct device *dev, size_t size,return dma_free_attrs (dev, size, cpu_addr, dma_addr,DMA_ATTR_WRITE_COMBINE ); } -#ifndef dma_free_writecombine -#define dma_free_writecombine dma_free_wc -#endif static inline int dma_mmap_wc(struct device *dev, struct vm_area_struct *vma,@@ -808,9 +802,6 @@ static inline int dma_mmap_wc(struct device *dev,return dma_mmap_attrs (dev, vma, cpu_addr, dma_addr, size,DMA_ATTR_WRITE_COMBINE ); } -#ifndef dma_mmap_writecombine -#define dma_mmap_writecombine dma_mmap_wc -#endif #ifdef CONFIG_NEED_DMA_MAP_STATE #define DEFINE_DMA_UNMAP_ADDR (ADDR_NAME ) dma_addr_t ADDR_NAME
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 1 line · Laurent Pinchart
I would have indented this line to match the rest. Apart from that,
I've fixed that up now that I've applied the patch.