Skip to content

Topology2: add echo reference support to jack and amp function topologies #10546

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

Open
bardliao wants to merge 2 commits into
base: main
Choose a base branch
from
+60 −68
Open

Topology2: add echo reference support to jack and amp function topologies #10546

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
7678ed5
topology2: cavs-sdw: add SDW_ECHO_REF_DAI flag
bardliao Feb 13, 2026
12e37b9
topology2: tplg-targets-sdca-generic: add echo ref to jack and amp
bardliao Feb 13, 2026
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
32 changes: 32 additions & 0 deletions tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ Define {
SDW_AMP_XOVER_EQFIR_PARAMS default
DOLBY_DAX_CORE_ID 0
USE_DAX "false"
SDW_ECHO_REF_DAI "false"
}

# override defaults with platform-specific config
Expand Down Expand Up @@ -138,6 +139,37 @@ IncludeByKey.NUM_HDMIS {
"[3-4]" "platform/intel/hdmi-generic.conf"
}

IncludeByKey.SDW_ECHO_REF_DAI {
"true" {
Object.Widget.alh-copier [
{
stream_name "Loopback_Virtual"
direction "capture"
type "dai_out"
index 12
dai_index 25
node_type $ALH_LINK_INPUT_CLASS
num_input_audio_formats 1
num_output_audio_formats 1
Object.Base.input_audio_format [
{
in_rate $JACK_RATE
in_bit_depth 32
in_valid_bit_depth $SDW_LINK_VALID_BITS
}
]
Object.Base.output_audio_format [
{
out_rate $JACK_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
]
}
}

IncludeByKey.SDW_AMP_XOVER {
"false" {
IncludeByKey.NUM_SDW_AMP_LINKS {
Expand Down
6 changes: 3 additions & 3 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 @@ -427,7 +427,7 @@ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt721-4ch-echoref.bin,DMIC0_ENHANCED_CAPTURE=true,\
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true"
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true,SDW_ECHO_REF_DAI=true"

# RT721 eval board with PCH-DMIC, sof_sdw_quirk_table with SOC_SDW_PCH_DMIC
# Enable echo reference capture from jack and speaker output
Expand All @@ -439,7 +439,7 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt721-4ch-echoref.bin,DMIC0_ENHANCED_CAPTURE=true,\
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
BT_NAME=SSP2-BT,BT_PCM_ID=20,BT_ID=10,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true"
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true,SDW_ECHO_REF_DAI=true"

# RT722 with PCH-DMIC and echo reference capture from jack and speaker output
"cavs-sdw\;sof-ptl-rt722-4ch-echoref\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,NUM_DMICS=4,\
Expand All @@ -448,5 +448,5 @@ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch-echoref.bin,DMIC0_ENHANCED_CAPTURE=true,\
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true"
SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true,SDW_ECHO_REF_DAI=true"
)
27 changes: 0 additions & 27 deletions tools/topology/topology2/platform/intel/sdw-amp-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,33 +1048,6 @@ IncludeByKey.SDW_AMP_FEEDBACK {

IncludeByKey.SDW_SPK_ECHO_REF {
"true" {
Object.Widget.alh-copier [
{
stream_name "Loopback_Virtual"
direction "capture"
type "dai_out"
index 22
dai_index 25
node_type $ALH_LINK_INPUT_CLASS
num_input_audio_formats 1
num_output_audio_formats 1
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth $SDW_LINK_VALID_BITS
in_sample_type $SAMPLE_TYPE_MSB_INTEGER
in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]"
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
]

Object.Widget.module-copier."22" {
index 21
num_input_pins 1
Expand Down
33 changes: 0 additions & 33 deletions tools/topology/topology2/platform/intel/sdw-jack-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,39 +741,6 @@ IncludeByKey.PASSTHROUGH {

IncludeByKey.SDW_JACK_ECHO_REF {
"true" {
IncludeByKey.SDW_SPK_ECHO_REF {
"false" {
# The virtual DAi is common with speaker. Normally this would be
# provided speaker tplg. If not present instantiate it here.
Object.Widget.alh-copier [
{
stream_name "Loopback_Virtual"
direction "capture"
type "dai_out"
index 12
dai_index 25
node_type $ALH_LINK_INPUT_CLASS
num_input_audio_formats 1
num_output_audio_formats 1
Object.Base.input_audio_format [
{
in_rate $JACK_RATE
in_bit_depth 32
in_valid_bit_depth $SDW_LINK_VALID_BITS
}
]
Object.Base.output_audio_format [
{
out_rate $JACK_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
]
} # SDW_SPK_ECHO_REF false
}

Object.Widget.module-copier."12" {
index 1
num_input_pins 1
Expand Down
30 changes: 25 additions & 5 deletions tools/topology/topology2/production/tplg-targets-sdca-generic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,43 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"

# Split topologies
"cavs-sdw\;sof-sdca-jack-id0\;SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0,SDW_ECHO_REF_DAI=true,SDW_JACK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-1amp-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-2amp-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-3amp-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-4amp-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-1amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-2amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-3amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-4amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"

"cavs-sdw\;sof-sdca-mic-id4\;SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\
SDW_DMIC_STREAM=Capture-SmartMic"
Expand Down