[Sound-open-firmware] [PATCH 2/2] topology: change to use DMA buffer type for host buffer.

[Keyon Jie]

Change to use DMA buffer type for host buffer in all pipelines.

Signed-off-by: Keyon Jie <yang.jie at linux.intel.com>
---
 topology/sof/pipe-low-latency-capture.m4  | 2 +-
 topology/sof/pipe-low-latency-playback.m4 | 2 +-
 topology/sof/pipe-passthrough-capture.m4  | 4 ++--
 topology/sof/pipe-passthrough-playback.m4 | 4 ++--
 topology/sof/pipe-pcm-media.m4            | 2 +-
 topology/sof/pipe-src-capture.m4          | 4 ++--
 topology/sof/pipe-src-playback.m4         | 2 +-
 topology/sof/pipe-volume-capture.m4       | 4 ++--
 topology/sof/pipe-volume-playback.m4      | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4
index 0c989a7..e7abf44 100644
--- a/topology/sof/pipe-low-latency-capture.m4
+++ b/topology/sof/pipe-low-latency-capture.m4
@@ -53,7 +53,7 @@ W_PGA(0, PCM PCM_ID Capture Volume, PIPELINE_FORMAT, 2, 2, 0)
 # Capture Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
-W_BUFFER(1, COMP_BUFFER_SIZE(2,
+W_BUFFER_DMA(1, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 
 #
diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4
index cd04ccf..724d10e 100644
--- a/topology/sof/pipe-low-latency-playback.m4
+++ b/topology/sof/pipe-low-latency-playback.m4
@@ -100,7 +100,7 @@ W_PGA(1, Master Playback Volume, PIPELINE_FORMAT, 2, 1, 1)
 W_MIXER(0, PIPELINE_FORMAT, 1, 1, 1)
 
 # Low Latency Buffers
-W_BUFFER(0, COMP_BUFFER_SIZE(2,
+W_BUFFER_DMA(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 W_BUFFER(1, COMP_BUFFER_SIZE(1,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS,SCHEDULE_FRAMES))
diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4
index 2c2a495..4c2e91a 100644
--- a/topology/sof/pipe-passthrough-capture.m4
+++ b/topology/sof/pipe-passthrough-capture.m4
@@ -16,8 +16,8 @@ include(`local.m4')
 # with 0 sink and 2 source periods
 W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2)
 
-# Capture Buffers
-W_BUFFER(0, COMP_BUFFER_SIZE(2,
+# Capture DMA Buffers
+W_BUFFER_DMA(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 
 #
diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4
index 1722256..4331c02 100644
--- a/topology/sof/pipe-passthrough-playback.m4
+++ b/topology/sof/pipe-passthrough-playback.m4
@@ -16,8 +16,8 @@ include(`local.m4')
 # with 2 sink and 0 source periods
 W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
 
-# Playback Buffers
-W_BUFFER(0, COMP_BUFFER_SIZE(2,
+# Playback DMA Buffers
+W_BUFFER_DMA(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 
 #
diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4
index 7bfb35a..520665a 100644
--- a/topology/sof/pipe-pcm-media.m4
+++ b/topology/sof/pipe-pcm-media.m4
@@ -74,7 +74,7 @@ W_PGA(0, PCM PCM_ID Playback Volume, PIPELINE_FORMAT, 2, 2, 2)
 W_SRC(0, PIPELINE_FORMAT, 2, 2, media_src_conf, 2)
 
 # Media Source Buffers to SRC, make them big enough to deal with 2 * rate.
-W_BUFFER(0, COMP_BUFFER_SIZE(4,
+W_BUFFER_DMA(0, COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 W_BUFFER(1,COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4
index c843a6c..73339ec 100644
--- a/topology/sof/pipe-src-capture.m4
+++ b/topology/sof/pipe-src-capture.m4
@@ -36,7 +36,7 @@ SectionData."media_src_conf" {
 W_SRC(0, PIPELINE_FORMAT, 4, 4, media_src_conf, 2)
 
 # Playback Buffers
-W_BUFFER(0, COMP_BUFFER_SIZE(4,
+W_BUFFER_DMA(0, COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 W_BUFFER(1, COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
@@ -56,7 +56,7 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES,
 #
 # Pipeline Graph
 #
-#  host PCM_P --> B0 --> SRC 0 --> B1 --> sink DAI0
+#  host PCM_C <-- B0 <-- SRC 0 <-- B1 <-- sink DAI0
 
 SectionGraph."pipe-pass-src-capture-PIPELINE_ID" {
 	index STR(PIPELINE_ID)
diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4
index d037543..ecbb491 100644
--- a/topology/sof/pipe-src-playback.m4
+++ b/topology/sof/pipe-src-playback.m4
@@ -36,7 +36,7 @@ SectionData."media_src_conf" {
 W_SRC(0, PIPELINE_FORMAT, 4, 4, media_src_conf, 2)
 
 # Playback Buffers
-W_BUFFER(0, COMP_BUFFER_SIZE(4,
+W_BUFFER_DMA(0, COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 W_BUFFER(1, COMP_BUFFER_SIZE(4,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4
index 8532aa3..5e8cbd2 100644
--- a/topology/sof/pipe-volume-capture.m4
+++ b/topology/sof/pipe-volume-capture.m4
@@ -49,10 +49,10 @@ W_PCM_CAPTURE(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2)
 # "Volume" has 2 source and 2 sink periods
 W_PGA(0, Master Capture Volume, PIPELINE_FORMAT, 2, 2, 2)
 
-# Playback Buffers
+# Capture Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
-W_BUFFER(1, COMP_BUFFER_SIZE(2,
+W_BUFFER_DMA(1, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 
 #
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4
index 54bc13d..9244f70 100644
--- a/topology/sof/pipe-volume-playback.m4
+++ b/topology/sof/pipe-volume-playback.m4
@@ -50,7 +50,7 @@ W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2)
 W_PGA(0, Master Playback Volume, PIPELINE_FORMAT, 2, 2, 2)
 
 # Playback Buffers
-W_BUFFER(0, COMP_BUFFER_SIZE(2,
+W_BUFFER_DMA(0, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
 W_BUFFER(1, COMP_BUFFER_SIZE(2,
 	COMP_SAMPLE_SIZE(DAI_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES))
-- 
2.11.0