[Sound-open-firmware] [PATCH] topology: pipelines: give more headroom for buffer size refinement
Give the ALSA HW refinement code more headroom for buffer calculations to provide more buffering options.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- topology/sof/pipe-low-latency-capture.m4 | 2 +- topology/sof/pipe-low-latency-playback.m4 | 4 ++-- topology/sof/pipe-passthrough-playback.m4 | 4 ++-- topology/sof/pipe-pcm-media.m4 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index ca9fe9c..3b53d0a 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -98,7 +98,7 @@ SectionPCMCapabilities.STR(Low Latency Capture PCM_ID) { periods_max "4" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" }
diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index a8e3fa5..00f7447 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -161,10 +161,10 @@ SectionPCMCapabilities.STR(Low Latency Playback PCM_ID) { channels_min "2" channels_max "2" periods_min "2" - periods_max "4" + periods_max "16" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" }
diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 1fc76c7..98b479f 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -58,10 +58,10 @@ SectionPCMCapabilities.STR(Passthrough Playback PCM_ID) { channels_min "2" channels_max "4" periods_min "2" - periods_max "4" + periods_max "16" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" }
diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index ac2aaa7..fd6db04 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -129,7 +129,7 @@ SectionPCMCapabilities.STR(Media Playback PCM_ID) { periods_max "32" period_size_min "4096" period_size_max "262144" - buffer_size_min "8192" + buffer_size_min "8388608" buffer_size_max "8388608" }
The wrong name is used for naming and may collide with the capture stream on the same DAI.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- topology/m4/local.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index a888438..a14f310 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -255,7 +255,7 @@ define(`N_DAI_IN', DAI_NAME`.IN')
dnl W_DAI_OUT(stream, type, index, data, periods_sink, periods_source, preload) define(`W_DAI_OUT', -`SectionVendorTuples."'N_DAI_IN($1)`_tuples_w_comp" {' +`SectionVendorTuples."'N_DAI_OUT($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' ` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) @@ -263,8 +263,8 @@ define(`W_DAI_OUT', ` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' -`SectionData."'N_DAI_IN($1)`_data_w_comp" {' -` tuples "'N_DAI_IN($1)`_tuples_w_comp"' +`SectionData."'N_DAI_OUT($1)`_data_w_comp" {' +` tuples "'N_DAI_OUT($1)`_tuples_w_comp"' `}' `SectionVendorTuples."'N_DAI_OUT($1)`_tuples_w" {' ` tokens "sof_dai_tokens"' @@ -291,7 +291,7 @@ define(`W_DAI_OUT', ` stream_name "'$1`"' ` data [' ` "'N_DAI_OUT($1)`_data_w"' -` "'N_DAI_IN($1)`_data_w_comp"' +` "'N_DAI_OUT($1)`_data_w_comp"' ` "'N_DAI_OUT($1)`_data_str"' ` "'$4`"' ` ]'
participants (1)
-
Liam Girdwood