From owner-svn-src-all@FreeBSD.ORG  Fri Mar 11 22:42:04 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7DC7C1065670;
	Fri, 11 Mar 2011 22:42:04 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C7748FC13;
	Fri, 11 Mar 2011 22:42:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2BMg4cB096463;
	Fri, 11 Mar 2011 22:42:04 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BMg4pk096461;
	Fri, 11 Mar 2011 22:42:04 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201103112242.p2BMg4pk096461@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 11 Mar 2011 22:42:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219548 - head/sys/dev/sound/pcm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2011 22:42:04 -0000

Author: marius
Date: Fri Mar 11 22:42:04 2011
New Revision: 219548
URL: http://svn.freebsd.org/changeset/base/219548

Log:
  Allocate the sound buffer DMA memory coherent. While NetBSD typically
  also does this for sound drivers it's probably not necessary for all
  combinations of controllers and drivers. However, given that our sound
  drivers completely lack bus_dmamap_sync(9) calls this at least serves
  as a workaround when enabling use of the IOMMU streaming buffers on
  sparc64 and generally for arm and mips.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/sound/pcm/buffer.c

Modified: head/sys/dev/sound/pcm/buffer.c
==============================================================================
--- head/sys/dev/sound/pcm/buffer.c	Fri Mar 11 22:32:17 2011	(r219547)
+++ head/sys/dev/sound/pcm/buffer.c	Fri Mar 11 22:42:04 2011	(r219548)
@@ -93,7 +93,7 @@ sndbuf_alloc(struct snd_dbuf *b, bus_dma
 	int ret;
 
 	b->dmatag = dmatag;
-	b->dmaflags = dmaflags | BUS_DMA_NOWAIT;
+	b->dmaflags = dmaflags | BUS_DMA_NOWAIT | BUS_DMA_COHERENT;
 	b->maxsize = size;
 	b->bufsize = b->maxsize;
 	b->buf_addr = 0;