[4/8] sound: hpios: don't pass GFP_DMA32 to dma_alloc_coherent
diff mbox series

Message ID 20181013151707.32210-5-hch@lst.de
State New
Headers show
Series
  • [1/8] cpufreq: tegra186: don't pass GFP_DMA32 to dma_alloc_coherent
Related show

Commit Message

Christoph Hellwig Oct. 13, 2018, 3:17 p.m. UTC
The DMA API does its own zone decisions based on the coherent_dma_mask.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 sound/pci/asihpi/hpios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai Oct. 13, 2018, 4:18 p.m. UTC | #1
On Sat, 13 Oct 2018 17:17:03 +0200,
Christoph Hellwig wrote:
> 
> The DMA API does its own zone decisions based on the coherent_dma_mask.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: Takashi Iwai <tiwai@suse.de>


Would you like to take this as a series, or shall I take individually
through sound tree?


thanks,

Takashi

> ---
>  sound/pci/asihpi/hpios.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c
> index 5ef4fe964366..7c91330af719 100644
> --- a/sound/pci/asihpi/hpios.c
> +++ b/sound/pci/asihpi/hpios.c
> @@ -49,7 +49,7 @@ u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
>  	/*?? any benefit in using managed dmam_alloc_coherent? */
>  	p_mem_area->vaddr =
>  		dma_alloc_coherent(&pdev->dev, size, &p_mem_area->dma_handle,
> -		GFP_DMA32 | GFP_KERNEL);
> +		GFP_KERNEL);
>  
>  	if (p_mem_area->vaddr) {
>  		HPI_DEBUG_LOG(DEBUG, "allocated %d bytes, dma 0x%x vma %p\n",
> -- 
> 2.19.1
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
Christoph Hellwig Oct. 13, 2018, 4:35 p.m. UTC | #2
On Sat, Oct 13, 2018 at 06:18:28PM +0200, Takashi Iwai wrote:
> On Sat, 13 Oct 2018 17:17:03 +0200,
> Christoph Hellwig wrote:
> > 
> > The DMA API does its own zone decisions based on the coherent_dma_mask.
> > 
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Reviewed-by: Takashi Iwai <tiwai@suse.de>
> 
> 
> Would you like to take this as a series, or shall I take individually
> through sound tree?

There is nothing that depends on this, so feel free to apply the
two sound patches to your tree.
Takashi Iwai Oct. 13, 2018, 6:10 p.m. UTC | #3
On Sat, 13 Oct 2018 18:35:40 +0200,
Christoph Hellwig wrote:
> 
> On Sat, Oct 13, 2018 at 06:18:28PM +0200, Takashi Iwai wrote:
> > On Sat, 13 Oct 2018 17:17:03 +0200,
> > Christoph Hellwig wrote:
> > > 
> > > The DMA API does its own zone decisions based on the coherent_dma_mask.
> > > 
> > > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > 
> > Reviewed-by: Takashi Iwai <tiwai@suse.de>
> > 
> > 
> > Would you like to take this as a series, or shall I take individually
> > through sound tree?
> 
> There is nothing that depends on this, so feel free to apply the
> two sound patches to your tree.

OK, thanks.


Takashi

Patch
diff mbox series

diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c
index 5ef4fe964366..7c91330af719 100644
--- a/sound/pci/asihpi/hpios.c
+++ b/sound/pci/asihpi/hpios.c
@@ -49,7 +49,7 @@  u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,
 	/*?? any benefit in using managed dmam_alloc_coherent? */
 	p_mem_area->vaddr =
 		dma_alloc_coherent(&pdev->dev, size, &p_mem_area->dma_handle,
-		GFP_DMA32 | GFP_KERNEL);
+		GFP_KERNEL);
 
 	if (p_mem_area->vaddr) {
 		HPI_DEBUG_LOG(DEBUG, "allocated %d bytes, dma 0x%x vma %p\n",