Skip to content

Commit 8c20e6b

Browse files
Jyri Sarhakv2019i
authored andcommitted
Topology2: Add nocodec DP core 1 test topologies for MTL, LNL, and PTL
This commit creates three new topologies, sof-mtl-nocodec-dp-core-test.tplg, sof-lnl-nocodec-dp-core-test.tplg, and sof-ptl-nocodec-dp-core-test.tplg. They are otherwise the same as the corresponding standard nocodec topologies, but both the src.11.1 on SSP2_Playback and src.5.1 on SSP2 Capture have scheduler_domain attribute set to "DP" and core_id to 1. This configuration executes SRC components for playback and capture to/from hw:0,2 on DSP core 1 in Data Processing mode, while the rest of the SSP2 pipelines are executed on DSP core 2. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
1 parent 3e06cd9 commit 8c20e6b

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

tools/topology/topology2/cavs-nocodec.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Define {
9595
DMIC0_PCM_0_NAME "DMIC SFX1"
9696
DMIC0_PCM_1_NAME "DMIC SFX2"
9797
SRC_DOMAIN "default"
98+
# Keep DP_SRC_CORE_ID == SSP2_PCM_CORE_ID, no nested define resolvation ATM
99+
DP_SRC_CORE_ID 2
98100
}
99101

100102
# override defaults with platform-specific config
@@ -290,6 +292,7 @@ IncludeByKey.PASSTHROUGH {
290292
}
291293
Object.Widget.src.1 {
292294
scheduler_domain "$SRC_DOMAIN"
295+
core_id $DP_SRC_CORE_ID
293296
}
294297
Object.Widget.pipeline.1 {
295298
core $SSP2_PCM_CORE_ID
@@ -892,6 +895,7 @@ IncludeByKey.PASSTHROUGH {
892895
index 11
893896
rate_in 48000
894897
scheduler_domain "$SRC_DOMAIN"
898+
core_id $DP_SRC_CORE_ID
895899

896900
<include/components/src_format_s32_convert_from_48k.conf>
897901
}

tools/topology/topology2/development/tplg-targets.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,16 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,SRC_DOMAIN=DP"
309309
"cavs-nocodec\;sof-ptl-nocodec-dp-test\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
310310
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN=DP"
311311

312+
# SSP test topology for Data Processing on core 1 SRC for MTL
313+
"cavs-nocodec\;sof-mtl-nocodec-dp-core-test\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
314+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,SRC_DOMAIN=DP,DP_SRC_CORE_ID=1"
315+
# SSP test topology for Data Processing on core 1 SRC for LNL
316+
"cavs-nocodec\;sof-lnl-nocodec-dp-core-test\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
317+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,SRC_DOMAIN=DP,DP_SRC_CORE_ID=1"
318+
# SSP test topology for Data Processing on core 1 SRC for PTL
319+
"cavs-nocodec\;sof-ptl-nocodec-dp-core-test\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
320+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN=DP,DP_SRC_CORE_ID=1"
321+
312322
# Add MFCC to 16 kHz DMIC1, 2ch with NHLT - cAVS
313323
"sof-hda-generic\;sof-hda-generic-cavs25-2ch-mfcc\;HDA_CONFIG=mix,\
314324
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-cavs25-2ch-mfcc.bin,\

0 commit comments

Comments
 (0)