Skip to content

Commit 7ee9fb9

Browse files
committed
dp: nocodec: switch playback SRC to DP by default
Switch one of the two SRC instances in the nocodec topology to DP mode by default. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 99663a4 commit 7ee9fb9

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

tools/topology/topology2/cavs-nocodec.conf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ Define {
9696
SSP2_PCM_CORE_ID 2
9797
DMIC0_PCM_0_NAME "DMIC SFX1"
9898
DMIC0_PCM_1_NAME "DMIC SFX2"
99-
SRC_DOMAIN "default"
99+
SRC_DOMAIN_PLAYBACK "DP"
100+
SRC_DOMAIN_CAPTURE "default"
100101
# Keep DP_SRC_CORE_ID == SSP2_PCM_CORE_ID, no nested define resolvation ATM
101102
DP_SRC_CORE_ID 2
102103
}
@@ -694,8 +695,8 @@ IncludeByKey.PASSTHROUGH {
694695
}
695696
}
696697
Object.Widget.src.1 {
697-
scheduler_domain "$SRC_DOMAIN"
698-
IncludeByKey.SRC_DOMAIN {
698+
scheduler_domain "$SRC_DOMAIN_PLAYBACK"
699+
IncludeByKey.SRC_DOMAIN_PLAYBACK {
699700
"DP" {
700701
core_id $DP_SRC_CORE_ID
701702
domain_id 123
@@ -1378,8 +1379,8 @@ IncludeByKey.PASSTHROUGH {
13781379
Object.Widget.src.1 {
13791380
index 11
13801381
rate_in 48000
1381-
scheduler_domain "$SRC_DOMAIN"
1382-
IncludeByKey.SRC_DOMAIN {
1382+
scheduler_domain "$SRC_DOMAIN_CAPTURE"
1383+
IncludeByKey.SRC_DOMAIN_CAPTURE {
13831384
"DP" {
13841385
core_id $DP_SRC_CORE_ID
13851386
domain_id 123

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,23 +306,23 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec-rtcaec.bin"
306306

307307
# SSP test topology for Data Processing SRC on MTL
308308
"cavs-nocodec\;sof-mtl-nocodec-dp-test\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
309-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,SRC_DOMAIN=DP"
309+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,SRC_DOMAIN_CAPTURE=DP"
310310
# SSP test topology for Data Processing SRC on LNL
311311
"cavs-nocodec\;sof-lnl-nocodec-dp-test\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
312-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,SRC_DOMAIN=DP"
312+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,SRC_DOMAIN_CAPTURE=DP"
313313
# SSP test topology for Data Processing SRC on PTL
314314
"cavs-nocodec\;sof-ptl-nocodec-dp-test\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
315-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN=DP"
315+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN_CAPTURE=DP"
316316

317317
# SSP test topology for Data Processing on core 1 SRC for MTL
318318
"cavs-nocodec\;sof-mtl-nocodec-dp-core-test\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
319-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,SRC_DOMAIN=DP,DP_SRC_CORE_ID=1"
319+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,SRC_DOMAIN_CAPTURE=DP,DP_SRC_CORE_ID=1"
320320
# SSP test topology for Data Processing on core 1 SRC for LNL
321321
"cavs-nocodec\;sof-lnl-nocodec-dp-core-test\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
322-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,SRC_DOMAIN=DP,DP_SRC_CORE_ID=1"
322+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,SRC_DOMAIN_CAPTURE=DP,DP_SRC_CORE_ID=1"
323323
# SSP test topology for Data Processing on core 1 SRC for PTL
324324
"cavs-nocodec\;sof-ptl-nocodec-dp-core-test\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
325-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN=DP,DP_SRC_CORE_ID=1"
325+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN_CAPTURE=DP,DP_SRC_CORE_ID=1"
326326

327327
# Add MFCC to 16 kHz DMIC1, 2ch with NHLT - cAVS
328328
"sof-hda-generic\;sof-hda-generic-cavs25-2ch-mfcc\;HDA_CONFIG=mix,\

0 commit comments

Comments
 (0)