From 9d3fbc047806d6ca8e5fc09339054193c9e1cf88 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Wed, 4 Nov 2020 13:21:17 +0800 Subject: [PATCH 1/2] topology: support set DAI_PERIODS in pipeline manually This patch allows to set DAI_PERIODS in pipeline manually. Signed-off-by: Libin Yang --- tools/topology/m4/pipeline.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/topology/m4/pipeline.m4 b/tools/topology/m4/pipeline.m4 index 37c5ca8d80ad..e0297a8f9bbd 100644 --- a/tools/topology/m4/pipeline.m4 +++ b/tools/topology/m4/pipeline.m4 @@ -72,7 +72,7 @@ define(`PIPELINE_PCM_ADD', `define(`SCHEDULE_TIME_DOMAIN', $12)' `define(`DAI_FORMAT', $5)' `define(`SCHED_COMP', $13)' -`define(`DAI_PERIODS', DAI_DEFAULT_PERIODS)' +`define(`DAI_PERIODS', ifelse(`$14', `', `DAI_DEFAULT_PERIODS', `$14'))' `include($1)' `DEBUG_PCM_ADD($1, $3)' ,`fatal_error(`Invalid parameters ($#) to PIPELINE_PCM_ADD')')' From 16c1e95f042fee8f777b76cc8888ccc4611d1866 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Wed, 4 Nov 2020 13:22:40 +0800 Subject: [PATCH 2/2] topology: use 3 periods in muxdemux pipelines in sof-icl-rt711-rt1308-rt715 This patch assigns 3 periods audio buffer in muxdemux pipelines in sof-icl-rt711-rt1308-rt715-hdmi.m4. Signed-off-by: Libin Yang --- tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 index 1bbb86eff4a7..44f97e10c64e 100644 --- a/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -103,7 +103,7 @@ PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION',`sof/pipe-volume-playback.m4', `sof/pipe-volume-demux-playback.m4'), 3, 2, 2, s32le, 1000, 0, 0, - 48000, 48000, 48000) + 48000, 48000, 48000,,,3) # Low Latency playback pipeline 4 on PCM 3 using max 2 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 @@ -111,7 +111,7 @@ PIPELINE_PCM_ADD(ifdef(`NO_AGGREGATION', `sof/pipe-volume-playback.m4', `sof/pipe-dai-endpoint.m4'), 4, 3, 2, s32le, 1000, 0, 0, - 48000, 48000, 48000) + 48000, 48000, 48000,,,3) ') # Low Latency capture pipeline 5 on PCM 4 using max 2 channels of s32le.