From b22a4d4e582f404ef3952403be16101c4aa7ccc3 Mon Sep 17 00:00:00 2001 From: Rander Wang Date: Thu, 21 Sep 2023 15:12:33 +0800 Subject: [PATCH] topology2: merge multi-core test into nocodec topology The multi-core topology was created since multi-core feature had a few bugs at that time so it was for validation test. Now this feature works fine so merge it into nocodec topology then it will be tested by github CI. And we don't need to maintain a dedicated multi-core topology. Signed-off-by: Rander Wang --- .../topology2/cavs-nocodec-multicore.conf | 842 ------------------ tools/topology/topology2/cavs-nocodec.conf | 60 +- .../topology2/development/tplg-targets.cmake | 16 - 3 files changed, 53 insertions(+), 865 deletions(-) delete mode 100644 tools/topology/topology2/cavs-nocodec-multicore.conf diff --git a/tools/topology/topology2/cavs-nocodec-multicore.conf b/tools/topology/topology2/cavs-nocodec-multicore.conf deleted file mode 100644 index 36c20c6b682d..000000000000 --- a/tools/topology/topology2/cavs-nocodec-multicore.conf +++ /dev/null @@ -1,842 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Define { - MCLK 24576000 - PLATFORM "none" - SSP0_CORE_ID 0 - SSP1_CORE_ID 1 - SSP2_CORE_ID 2 - - NUM_DMICS 0 - # override DMIC default definitions - DMIC0_HOST_PIPELINE_ID 20 - DMIC0_DAI_PIPELINE_ID 21 - DMIC0_HOST_PIPELINE_SINK 'gain.20.1' - DMIC0_DAI_PIPELINE_SRC 'module-copier.21.2' - DMIC0_DAI_COPIER 'dai-copier.DMIC.NoCodec-6.capture' - DMIC0_DAI_GAIN 'eqiir.21.1' - DMIC0_PCM_CAPS 'Gain Capture 20' - DMIC1_PCM_CAPS 'DMIC1 WOV Capture' - DMIC0_NAME 'NoCodec-6' - DMIC1_NAME 'NoCodec-7' - DMIC0_PCM_0_NAME "DMIC SFX1" - DMIC0_PCM_1_NAME "DMIC SFX2" - DMIC0_PCM_0_PCM_ID 27 - DMIC0_PCM_1_PCM_ID 28 - - SSP0_PCM_NAME "Port0" - SSP1_PCM_NAME "Port1" - SSP2_PCM_NAME "Port2" -} - -# override defaults with platform-specific config -IncludeByKey.PLATFORM { - "tgl" "platform/intel/tgl.conf" - "adl" "platform/intel/tgl.conf" - "mtl" "platform/intel/mtl.conf" -} - -# include DMIC config if needed. -IncludeByKey.NUM_DMICS { - "[1-4]" "platform/intel/dmic-generic.conf" -} - -# -# List of all DAIs -# -Object.Dai.SSP [ - { - id 0 - dai_index 0 - direction "duplex" - name NoCodec-0 - default_hw_conf_id 0 - sample_bits 32 - quirks "lbm_mode" - io_clk $MCLK - - Object.Base.hw_config.1 { - name "SSP0" - id 0 - bclk_freq 3072000 - tdm_slot_width 32 - # TODO: remove this. Needs alsaptlg change. - Object.Base.link_config.1 { - clock_source 1 - } - } - } - { - id 2 - dai_index 2 - direction "duplex" - name NoCodec-2 - default_hw_conf_id 0 - sample_bits 32 - quirks "lbm_mode" - io_clk $MCLK - - Object.Base.hw_config.1 { - name "SSP2" - id 0 - bclk_freq 3072000 - tdm_slot_width 32 - # TODO: remove this. Needs alsaptlg change. - Object.Base.link_config.1 { - clock_source 1 - } - } - } -] - -# -# Pipeline definitions -# -# PCM0 ---> gain ---> Mixin ---> Mixout ---> gain ---> SSP0 (core SSP0_CORE_ID) -# PCM1 ---> gain ---> Mixin ---> Mixout ---> gain ---> SSP1 (core SSP1_CORE_ID) -# PCM2 ---> gain ---> Mixin ---> Mixout ---> gain ---> SSP2 (core SSP2_CORE_ID) -# SSP0 ---> PCM0 -# SSP1 ---> PCM1 -# SSP2 ---> PCM2 - -# Pipeline ID:1 PCM ID: 0 -Object.Pipeline.host-copier-gain-mixin-playback [ - { - index 1 - - core $SSP0_CORE_ID - Object.Widget.host-copier.1 { - core_id $SSP0_CORE_ID - stream_name 'SSP0 Playback' - pcm_id 0 - } - Object.Widget.gain.1 { - core_id $SSP0_CORE_ID - Object.Control.mixer.1 { - name 'Pre Mixer $SSP0_PCM_NAME Playback Volume' - } - } - } - { - index 5 - - core $SSP2_CORE_ID - Object.Widget.host-copier.1 { - core_id $SSP2_CORE_ID - stream_name 'SSP2 Playback' - pcm_id 2 - } - Object.Widget.gain.1 { - core_id $SSP2_CORE_ID - Object.Control.mixer.1 { - name 'Pre Mixer $SSP2_PCM_NAME Playback Volume' - } - } - Object.Widget.mixin.1 { - core_id $SSP2_CORE_ID - } - } -] - -Object.Pipeline.mixout-gain-dai-copier-playback [ - { - index 14 - - core $SSP0_CORE_ID - Object.Widget.dai-copier.1 { - core_id $SSP0_CORE_ID - dai_index 0 - dai_type "SSP" - copier_type "SSP" - stream_name "NoCodec-0" - node_type $I2S_LINK_OUTPUT_CLASS - } - - Object.Widget.gain.1 { - core_id $SSP0_CORE_ID - Object.Control.mixer.1 { - name 'Post Mixer $SSP0_PCM_NAME Playback Volume' - } - } - } - { - index 6 - - core $SSP2_CORE_ID - Object.Widget.dai-copier.1 { - core_id $SSP2_CORE_ID - dai_index 2 - dai_type "SSP" - copier_type "SSP" - stream_name "NoCodec-2" - node_type $I2S_LINK_OUTPUT_CLASS - } - - Object.Widget.gain.1 { - core_id $SSP2_CORE_ID - Object.Control.mixer.1 { - name 'Post Mixer $SSP2_PCM_NAME Playback Volume' - } - } - Object.Widget.mixout.1 { - core_id $SSP2_CORE_ID - } - } -] - -Object.Pipeline.host-gateway-capture [ - { - index 7 - - Object.Widget.host-copier.1 { - stream_name 'SSP0 Capture' - pcm_id 0 - } - } - { - index 11 - - Object.Widget.host-copier.1 { - stream_name 'SSP2 Capture' - pcm_id 2 - } - } -] - -Object.Pipeline.io-gateway-capture [ - { - index 8 - direction capture - - Object.Widget.dai-copier."1" { - dai_index 0 - dai_type "SSP" - type dai_out - copier_type "SSP" - stream_name "NoCodec-0" - node_type $I2S_LINK_INPUT_CLASS - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - ] - } - } - { - index 12 - direction capture - - Object.Widget.dai-copier."1" { - dai_index 2 - dai_type "SSP" - type dai_out - copier_type "SSP" - stream_name "NoCodec-2" - node_type $I2S_LINK_INPUT_CLASS - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - ] - } - } -] - -IncludeByKey.PASSTHROUGH { -"false" { - IncludeByKey.NUM_DMICS { - "[1-4]" { - Object.Pipeline.gain-module-copier [ - { - index 19 - core_id $DMIC_CORE_ID - direction "capture" - Object.Widget.pipeline.1 { - stream_name $DMIC0_DAI_COPIER - core $DMIC_CORE_ID - } - Object.Widget.module-copier.1 { - stream_name 'Gain Capture 19' - num_input_audio_formats 2 - num_output_audio_formats 2 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - { - in_channels 4 - in_bit_depth 32 - in_valid_bit_depth 32 - in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - in_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - { - out_channels 4 - out_bit_depth 32 - out_valid_bit_depth 32 - out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - out_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - } - Object.Widget.gain.1 { - num_input_audio_formats 2 - num_output_audio_formats 2 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - { - in_channels 4 - in_bit_depth 32 - in_valid_bit_depth 32 - in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - in_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - { - out_channels 4 - out_bit_depth 32 - out_valid_bit_depth 32 - out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - out_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Control.mixer.1 { - name 'Pre Demux $DMIC0_PCM_0_NAME Capture Volume' - } - } - } - ] - - Object.Pipeline.gain-capture [ - { - format $FORMAT - core_id $DMIC_CORE_ID - index 18 - Object.Widget.pipeline.1 { - stream_name "$DMIC0_PCM_0_NAME" - core $DMIC_CORE_ID - } - Object.Widget.host-copier.1 { - stream_name "Gain Capture 18" - pcm_id $DMIC0_PCM_0_PCM_ID - num_input_audio_formats 2 - num_output_audio_formats 2 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - { - in_channels 4 - in_bit_depth 32 - in_valid_bit_depth 32 - in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - in_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - { - out_channels 4 - out_bit_depth 32 - out_valid_bit_depth 32 - out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - out_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - } - Object.Widget.gain.1 { - num_input_audio_formats 2 - num_output_audio_formats 2 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - { - in_channels 4 - in_bit_depth 32 - in_valid_bit_depth 32 - in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - in_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - { - out_channels 4 - out_bit_depth 32 - out_valid_bit_depth 32 - out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - out_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Control.mixer.1 { - name 'Post Demux $DMIC0_PCM_0_NAME Capture Volume' - } - } - } - { - format $FORMAT - index 22 - core_id $DMIC_CORE_ID - Object.Widget.pipeline.1 { - stream_name "$DMIC0_PCM_1_NAME" - core $DMIC_CORE_ID - } - Object.Widget.host-copier.1 { - stream_name "Gain Capture 22" - pcm_id $DMIC0_PCM_1_PCM_ID - num_input_audio_formats 2 - num_output_audio_formats 2 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - { - in_channels 4 - in_bit_depth 32 - in_valid_bit_depth 32 - in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - in_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - { - out_channels 4 - out_bit_depth 32 - out_valid_bit_depth 32 - out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - out_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - } - Object.Widget.gain.1 { - num_input_audio_formats 2 - num_output_audio_formats 2 - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - { - in_channels 4 - in_bit_depth 32 - in_valid_bit_depth 32 - in_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - in_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - { - out_channels 4 - out_bit_depth 32 - out_valid_bit_depth 32 - out_ch_cfg $CHANNEL_CONFIG_3_POINT_1 - out_ch_map $CHANNEL_MAP_3_POINT_1 - } - ] - Object.Control.mixer.1 { - name 'Post Demux $DMIC0_PCM_1_NAME Capture Volume' - } - } - } - ] - } - } - - } -} - -Object.PCM.pcm [ - { - name "$SSP0_PCM_NAME" - id 0 - direction "duplex" - Object.Base.fe_dai.1 { - name "$SSP0_PCM_NAME" - } - - Object.PCM.pcm_caps.1 { - direction "playback" - name "SSP0 Playback" - formats 'S16_LE,S24_LE,S32_LE' - } - - Object.PCM.pcm_caps.2 { - direction "capture" - name "SSP0 Capture" - formats 'S16_LE,S24_LE,S32_LE' - } - } - { - name "$SSP2_PCM_NAME" - id 2 - direction "duplex" - Object.Base.fe_dai.1 { - name "$SSP2_PCM_NAME" - } - - Object.PCM.pcm_caps.1 { - direction "playback" - name "SSP2 Playback" - formats 'S16_LE,S24_LE,S32_LE' - } - - Object.PCM.pcm_caps.2 { - direction "capture" - name "SSP2 Capture" - formats 'S16_LE,S24_LE,S32_LE' - } - } -] - -IncludeByKey.PASSTHROUGH { -"false" { - IncludeByKey.NUM_DMICS { - "[1-4]" { - Object.PCM.pcm [ - { - name "$DMIC0_PCM_0_NAME" - id $DMIC0_PCM_0_PCM_ID - direction "capture" - Object.Base.fe_dai."$DMIC0_PCM_0_NAME" {} - - Object.PCM.pcm_caps."capture" { - name "Gain Capture 18" - # only 32-bit capture supported now - formats 'S32_LE' - channels_min $NUM_DMICS - channels_max $NUM_DMICS - } - } - { - name "$DMIC0_PCM_1_NAME" - id $DMIC0_PCM_1_PCM_ID - direction "capture" - Object.Base.fe_dai."$DMIC0_PCM_1_NAME" {} - - Object.PCM.pcm_caps."capture" { - name "Gain Capture 22" - # only 32-bit capture supported now - formats 'S32_LE' - channels_min $NUM_DMICS - channels_max $NUM_DMICS - } - } - ] - } - } - } -} - -Object.Base.route [ - { - source "gain.14.1" - sink "dai-copier.SSP.NoCodec-0.playback" - } - { - source "mixin.1.1" - sink "mixout.14.1" - } - { - source "gain.6.1" - sink "dai-copier.SSP.NoCodec-2.playback" - } - { - source "mixin.5.1" - sink "mixout.6.1" - } - { - source "dai-copier.SSP.NoCodec-0.capture" - sink "host-copier.0.capture" - } - { - source "dai-copier.SSP.NoCodec-2.capture" - sink "host-copier.2.capture" - } - { - source 'host-copier.0.playback' - sink 'gain.1.1' - } - { - source 'host-copier.2.playback' - sink 'gain.5.1' - } -] - -IncludeByKey.PASSTHROUGH { -"false" { - IncludeByKey.NUM_DMICS { - "[1-4]" { - Object.Base.route [ - { - source $DMIC0_DAI_PIPELINE_SRC - sink gain.19.1 - } - { - source module-copier.19.1 - sink gain.18.1 - } - { - source module-copier.19.1 - sink gain.22.1 - } - { - source "gain.18.1" - sink "host-copier.$DMIC0_PCM_0_PCM_ID.capture" - } - { - source "gain.22.1" - sink "host-copier.$DMIC0_PCM_1_PCM_ID.capture" - } - ] - } - } - } -} - -# There is pinmux conflict between SSP1 and DMIC on MTL RVP, -# so include SSP1 pipelines conditionally. -IncludeByKey.SSP1_ENABLED { - "true" { - Object.Dai.SSP [ - { - id 1 - dai_index 1 - direction "duplex" - name NoCodec-1 - default_hw_conf_id 0 - sample_bits 32 - quirks "lbm_mode" - io_clk $MCLK - - Object.Base.hw_config.1 { - name "SSP1" - id 0 - bclk_freq 3072000 - tdm_slot_width 32 - # TODO: remove this. Needs alsaptlg change. - Object.Base.link_config.1 { - clock_source 1 - } - } - } - ] - - Object.Pipeline.host-copier-gain-mixin-playback [ - { - index 3 - - core $SSP1_CORE_ID - Object.Widget.host-copier.1 { - core_id $SSP1_CORE_ID - stream_name 'SSP1 Playback' - pcm_id 1 - } - Object.Widget.gain.1 { - core_id $SSP1_CORE_ID - Object.Control.mixer.1 { - name 'Pre Mixer $SSP1_PCM_NAME Playback Volume' - } - } - Object.Widget.mixin.1 { - core_id $SSP1_CORE_ID - } - } - ] - - Object.Pipeline.mixout-gain-dai-copier-playback [ - { - index 4 - - core $SSP1_CORE_ID - Object.Widget.dai-copier.1 { - core_id $SSP1_CORE_ID - dai_index 1 - dai_type "SSP" - copier_type "SSP" - stream_name "NoCodec-1" - node_type $I2S_LINK_OUTPUT_CLASS - } - - Object.Widget.gain.1 { - core_id $SSP1_CORE_ID - Object.Control.mixer.1 { - name 'Post Mixer $SSP1_PCM_NAME Playback Volume' - } - } - Object.Widget.mixout.1 { - core_id $SSP1_CORE_ID - } - } - ] - - Object.Pipeline.host-gateway-capture [ - { - index 9 - - Object.Widget.host-copier.1 { - stream_name 'SSP1 Capture' - pcm_id 1 - } - } - ] - - Object.Pipeline.io-gateway-capture [ - { - index 10 - direction capture - - Object.Widget.dai-copier."1" { - dai_index 1 - dai_type "SSP" - type dai_out - copier_type "SSP" - stream_name "NoCodec-1" - node_type $I2S_LINK_INPUT_CLASS - Object.Base.input_audio_format [ - { - in_bit_depth 32 - in_valid_bit_depth 32 - } - ] - Object.Base.output_audio_format [ - { - out_bit_depth 32 - out_valid_bit_depth 32 - } - ] - } - } - ] - - Object.PCM.pcm [ - { - name "$SSP1_PCM_NAME" - id 1 - direction "duplex" - Object.Base.fe_dai.1 { - name "$SSP1_PCM_NAME" - } - - Object.PCM.pcm_caps.1 { - direction "playback" - name "SSP1 Playback" - formats 'S16_LE,S24_LE,S32_LE' - } - - Object.PCM.pcm_caps.2 { - direction "capture" - name "SSP1 Capture" - formats 'S16_LE,S24_LE,S32_LE' - } - } - ] - - Object.Base.route [ - { - source "mixin.3.1" - sink "mixout.4.1" - } - { - source "gain.4.1" - sink "dai-copier.SSP.NoCodec-1.playback" - } - { - source "dai-copier.SSP.NoCodec-1.capture" - sink "host-copier.1.capture" - } - { - source 'host-copier.1.playback' - sink 'gain.3.1' - } - ] - } -} diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index 7284769c5194..702770c77d84 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -88,7 +88,9 @@ Define { SSP0_CAPTURE_PCM_ID 12 SSP0_PCM_ID 0 SSP1_PCM_NAME "Port1" + SSP1_PCM_CORE_ID 1 SSP2_PCM_NAME "Port2" + SSP2_PCM_CORE_ID 2 DMIC0_PCM_0_NAME "DMIC SFX1" DMIC0_PCM_1_NAME "DMIC SFX2" } @@ -199,6 +201,7 @@ IncludeByKey.PASSTHROUGH { Object.Pipeline.host-copier-gain-src-mixin-playback [ { index 5 + core_id $SSP2_PCM_CORE_ID Object.Widget.host-copier.1 { stream_name 'SSP2 Playback' @@ -210,6 +213,9 @@ IncludeByKey.PASSTHROUGH { name 'Pre Mixer $SSP2_PCM_NAME Playback Volume' } } + Object.Widget.pipeline.1 { + core $SSP2_PCM_CORE_ID + } } ] @@ -252,6 +258,7 @@ IncludeByKey.PASSTHROUGH { Object.Pipeline.mixout-gain-dai-copier-playback [ { index 6 + core_id $SSP2_PCM_CORE_ID Object.Widget.dai-copier.1 { dai_index 2 @@ -267,6 +274,10 @@ IncludeByKey.PASSTHROUGH { name 'Post Mixer $SSP2_PCM_NAME Playback Volume' } } + + Object.Widget.pipeline."1" { + core $SSP2_PCM_CORE_ID + } } ] @@ -578,6 +589,7 @@ IncludeByKey.PASSTHROUGH { } { index 5 + Object.Widget.host-copier.1 { stream_name 'SSP2 Playback' pcm_id 2 @@ -626,11 +638,16 @@ IncludeByKey.PASSTHROUGH { } { index 11 + core_id $SSP2_PCM_CORE_ID Object.Widget.host-copier.1 { stream_name 'SSP2 Capture' pcm_id 2 } + + Object.Widget.pipeline."1" { + core $SSP2_PCM_CORE_ID + } } ] @@ -672,6 +689,7 @@ Object.Pipeline.io-gateway-capture [ { index 12 direction capture + core_id $SSP2_PCM_CORE_ID Object.Widget.dai-copier."1" { dai_index 2 @@ -696,6 +714,10 @@ Object.Pipeline.io-gateway-capture [ } ] } + + Object.Widget.pipeline."1" { + core $SSP2_PCM_CORE_ID + } } ] @@ -704,6 +726,7 @@ IncludeByKey.PASSTHROUGH { Object.Pipeline.host-gateway-capture [ { index 11 + core_id $SSP2_PCM_CORE_ID Object.Widget.host-copier.1 { stream_name 'SSP2 Capture' @@ -711,15 +734,20 @@ IncludeByKey.PASSTHROUGH { } - } - ] - Object.Widget.src.1 { - index 11 - rate_in 48000 + Object.Widget.pipeline."1" { + core $SSP2_PCM_CORE_ID + } - - } + + Object.Widget.src.1 { + index 11 + rate_in 48000 + + + } + } + ] IncludeByKey.NUM_DMICS { "[1-4]" { @@ -1157,6 +1185,7 @@ IncludeByKey.SSP1_ENABLED { { index 10 direction capture + core_id $SSP1_PCM_CORE_ID Object.Widget.dai-copier."1" { dai_index 1 @@ -1181,17 +1210,26 @@ IncludeByKey.SSP1_ENABLED { } ] } + + Object.Widget.pipeline."1" { + core $SSP1_PCM_CORE_ID + } } ] Object.Pipeline.host-gateway-capture [ { index 9 + core_id $SSP1_PCM_CORE_ID Object.Widget.host-copier.1 { stream_name 'SSP1 Capture' pcm_id 1 } + + Object.Widget.pipeline."1" { + core $SSP1_PCM_CORE_ID + } } ] @@ -1200,6 +1238,7 @@ IncludeByKey.SSP1_ENABLED { Object.Pipeline.host-copier-gain-mixin-playback [ { index 3 + core_id $SSP1_PCM_CORE_ID Object.Widget.host-copier.1 { stream_name 'SSP1 Playback' @@ -1211,12 +1250,16 @@ IncludeByKey.SSP1_ENABLED { name 'Pre Mixer $SSP1_PCM_NAME Playback Volume' } } + Object.Widget.pipeline."1" { + core $SSP1_PCM_CORE_ID + } } ] Object.Pipeline.mixout-gain-dai-copier-playback [ { index 4 + core_id $SSP1_PCM_CORE_ID Object.Widget.dai-copier.1 { dai_index 1 @@ -1232,6 +1275,9 @@ IncludeByKey.SSP1_ENABLED { name 'Post Mixer $SSP1_PCM_NAME Playback Volume' } } + Object.Widget.pipeline."1" { + core $SSP1_PCM_CORE_ID + } } ] } diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake index 05b3f683a551..69c12d795a96 100644 --- a/tools/topology/topology2/development/tplg-targets.cmake +++ b/tools/topology/topology2/development/tplg-targets.cmake @@ -20,12 +20,6 @@ SSP0_MIXER_2LEVEL=1,PLATFORM=tgl" PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\ PLATFORM=adl" -"cavs-nocodec-multicore\;sof-tgl-nocodec-multicore-ssp0-ssp2\;PLATFORM=tgl,SSP1_ENABLED=false,\ -SSP2_CORE_ID=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec-multicore-ssp0-ssp2.bin" - -"cavs-nocodec-multicore\;sof-adl-nocodec-multicore-ssp0-ssp2\;PLATFORM=adl,SSP1_ENABLED=false,\ -SSP2_CORE_ID=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec-multicore-ssp0-ssp2.bin" - # SDW topology for MTL "cavs-sdw\;mtl-sdw\;NUM_HDMIS=0" @@ -40,16 +34,6 @@ DEEPBUFFER_D0I3_COMPATIBLE=true" PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec-ssp0-ssp2.bin,DEEPBUFFER_FW_DMA_MS=100,\ DEEPBUFFER_D0I3_COMPATIBLE=true" -"cavs-nocodec-multicore\;sof-mtl-nocodec-multicore\;PLATFORM=mtl,SSP1_ENABLED=true,SSP0_CORE_ID=0,\ -SSP1_CORE_ID=1,SSP2_CORE_ID=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec-multicore.bin" - -"cavs-nocodec-multicore\;sof-mtl-nocodec-multicore-ssp0-ssp2\;PLATFORM=mtl,SSP1_ENABLED=false,\ -SSP2_CORE_ID=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec-multicore-ssp0-ssp2.bin" - -"cavs-nocodec-multicore\;sof-mtl-nocodec-multicore-4ch\;PLATFORM=mtl,SSP1_ENABLED=false,\ -SSP0_CORE_ID=0,DMIC_CORE_ID=1,SSP2_CORE_ID=2,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ -PASSTHROUGH=false,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin" - # SSP topology for LNL "cavs-nocodec\;sof-lnl-nocodec\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\