alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Wolfram Sang <w.sang@pengutronix.de>
Cc: alsa-devel@alsa-project.org,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>
Subject: Re: [RFC 1/2] ASoC: imx-ssi: use dma_writecombine consistently
Date: Thu, 25 Aug 2011 16:19:45 +0200	[thread overview]
Message-ID: <20110825141945.GW31404@pengutronix.de> (raw)
In-Reply-To: <1314280496-21826-1-git-send-email-w.sang@pengutronix.de>

On Thu, Aug 25, 2011 at 03:54:55PM +0200, Wolfram Sang wrote:
> If the channel is allocated as writecombine, then mmaping it should also
> use writecombine. Also, add a proper device for the call. Ported from a
> similar fix for mach-mxs.
> 
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>

both:

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>


> ---
>  sound/soc/imx/imx-ssi.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
> index 10a8e27..3b8d5cd 100644
> --- a/sound/soc/imx/imx-ssi.c
> +++ b/sound/soc/imx/imx-ssi.c
> @@ -357,8 +357,8 @@ int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,
>  	struct snd_pcm_runtime *runtime = substream->runtime;
>  	int ret;
>  
> -	ret = dma_mmap_coherent(NULL, vma, runtime->dma_area,
> -			runtime->dma_addr, runtime->dma_bytes);
> +	ret = dma_mmap_writecombine(substream->pcm->card->dev, vma,
> +		runtime->dma_area, runtime->dma_addr, runtime->dma_bytes);
>  
>  	pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret,
>  			runtime->dma_area,
> -- 
> 1.7.5.4
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

  parent reply	other threads:[~2011-08-25 14:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-25 13:54 [RFC 1/2] ASoC: imx-ssi: use dma_writecombine consistently Wolfram Sang
2011-08-25 13:54 ` [RFC 2/2] ASoC: imx: use more robust checking of available streams Wolfram Sang
2011-08-25 14:19 ` Sascha Hauer [this message]
2011-08-25 16:21   ` [RFC 1/2] ASoC: imx-ssi: use dma_writecombine consistently Liam Girdwood
2011-08-31 19:33     ` Wolfram Sang
2011-08-31 19:34       ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110825141945.GW31404@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=lrg@ti.com \
    --cc=w.sang@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).