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

This places all SectionWidget.MIXER* topology widgets, created by
the W_MIXER() 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:42:57 +02:00 committed by Liam Girdwood
parent 90dd7909c7
commit ce5ed2d322
2 changed files with 4 additions and 3 deletions

View File

@ -2,19 +2,20 @@ divert(-1)
dnl Define macro for Mixer widget
dnl Mixer Name)
dnl N_MIXER(name)
define(`N_MIXER', `MIXER'PIPELINE_ID`.'$1)
dnl Pipe Buffer name in pipeline (pipeline, buffer)
define(`NPIPELINE_MIXER', `MIXER'$1`.'$2)
dnl W_MIXER(name, format, periods_sink, periods_source)
dnl W_MIXER(name, format, periods_sink, periods_source, core)
define(`W_MIXER',
`SectionVendorTuples."'N_MIXER($1)`_tuples_w" {'
` tokens "sof_comp_tokens"'
` tuples."word" {'
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3)
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4)
` SOF_TKN_COMP_CORE_ID' STR($5)
` }'
`}'
`SectionData."'N_MIXER($1)`_data_w" {'

View File

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