OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology: add a "core" parameter to the W_MUXDEMUX() macro 

This places all SectionWidget.MUXDEMUX* topology widgets, created by
the W_MUXDEMUX() macro on the same core, on which the respective
pipeline is scheduled.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2020-03-31 17:54:13 +02:00 committed by Liam Girdwood
parent ce5ed2d322
commit 6522872c92
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/topology/m4/muxdemux.m4
View File

@ -31,16 +31,17 @@ define(`MUXDEMUX_CONFIG',
`}'
)
dnl Mux name)
dnl N_MUXDEMUX(name)
define(`N_MUXDEMUX', `MUXDEMUX'PIPELINE_ID`.'$1)
dnl W_MUXDEMUX(name, mux/demux, format, periods_sink, periods_source, kcontrol_list)
dnl W_MUXDEMUX(name, mux/demux, format, periods_sink, periods_source, core, kcontrol_list)
define(`W_MUXDEMUX',
`SectionVendorTuples."'N_MUXDEMUX($1)`_tuples_w" {'
` tokens "sof_comp_tokens"'
` tuples."word" {'
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4)
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5)
` SOF_TKN_COMP_CORE_ID' STR($6)
` }'
`}'
`SectionData."'N_MUXDEMUX($1)`_data_w" {'
@ -71,7 +72,7 @@ define(`W_MUXDEMUX',
` "'N_MUXDEMUX($1)`_data_str"'
` ]'
` bytes ['
$6
$7
` ]'
`}')

3
tools/topology/sof/pipe-volume-demux-playback.m4
View File

@ -63,7 +63,8 @@ W_PGA(1, PIPELINE_FORMAT, DAI_PERIODS, 2, playback_pga_conf, SCHEDULE_CORE,
LIST(` ', "PIPELINE_ID Master Playback Volume"))
# Mux 0 has 2 sink and source periods.
W_MUXDEMUX(0, 1, PIPELINE_FORMAT, 2, 2, LIST(` ', "DEMUX"))
W_MUXDEMUX(0, 1, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE,
LIST(` ', "DEMUX"))
# Low Latency Buffers
W_BUFFER(0, COMP_BUFFER_SIZE(2,