Skip to content

Topology2 sched domain support #9959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 2 commits into from
Apr 28, 2025
Merged

Topology2 sched domain support #9959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2c8276
Topology2: Add "scheduler_domain" attribute to all widgets
Apr 6, 2025
f0195ef
Topology2: Add nocodec DP test topologies for MTL, LNL, and PTL
Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ Define {
SSP2_PCM_CORE_ID 2
DMIC0_PCM_0_NAME "DMIC SFX1"
DMIC0_PCM_1_NAME "DMIC SFX2"
SRC_DOMAIN "default"
}

# override defaults with platform-specific config
Expand Down Expand Up @@ -245,6 +246,9 @@ IncludeByKey.PASSTHROUGH {
name 'Pre Mixer $SSP2_PCM_NAME Playback Volume'
}
}
Object.Widget.src.1 {
scheduler_domain "$SRC_DOMAIN"
}
Object.Widget.pipeline.1 {
core $SSP2_PCM_CORE_ID
}
Expand Down Expand Up @@ -883,6 +887,7 @@ IncludeByKey.PASSTHROUGH {
Object.Widget.src.1 {
index 11
rate_in 48000
scheduler_domain "$SRC_DOMAIN"

<include/components/src_format_s32_convert_from_48k.conf>
}
Expand Down
10 changes: 10 additions & 0 deletions tools/topology/topology2/development/tplg-targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,16 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec-crossover.bin,EFX_CROSSOVE
"development/cavs-nocodec-rtcaec\;sof-tgl-nocodec-rtcaec\;PLATFORM=tgl,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec-rtcaec.bin"

# SSP test topology for Data Processing SRC on MTL
"cavs-nocodec\;sof-mtl-nocodec-dp-test\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,SRC_DOMAIN=DP"
# SSP test topology for Data Processing SRC on LNL
"cavs-nocodec\;sof-lnl-nocodec-dp-test\;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,SRC_DOMAIN=DP"
# SSP test topology for Data Processing SRC on PTL
"cavs-nocodec\;sof-ptl-nocodec-dp-test\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin,SRC_DOMAIN=DP"

# Add MFCC to 16 kHz DMIC1, 2ch with NHLT - cAVS
"sof-hda-generic\;sof-hda-generic-cavs25-2ch-mfcc\;HDA_CONFIG=mix,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-cavs25-2ch-mfcc.bin,\
Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/include/common/tokens.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Object.Base.VendorToken {
num_input_audio_formats 415
num_output_audio_formats 416
no_wname_in_kcontrol_name 417
scheduler_domain 418
}

"2" {
Expand Down
17 changes: 17 additions & 0 deletions tools/topology/topology2/include/components/widget-common.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,20 @@ DefineAttribute."no_wname_in_kcontrol_name" {
}

no_wname_in_kcontrol_name "true"

## widget format
DefineAttribute."scheduler_domain" {
type "string"
# Token set reference name and type
token_ref "comp.string"
constraints {
!valid_values [
# Low Latency
"LL"
# Data Processing
"DP"
# Use manifest value
"default"
]
}
}
Loading