Skip to content

topology2: use a macro to config if a sdw amplifier support feedback #6915

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
lgirdwood merged 3 commits into from
Feb 21, 2023
Merged

topology2: use a macro to config if a sdw amplifier support feedback #6915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20e216c
topology2: follow the same rule as pipeline and route id to assign ALH
bardliao Feb 17, 2023
e40a68e
topology2: use a macro to config if a sdw amplifier support feedback
bardliao Feb 17, 2023
74184ff
topology2: add sof-adl-rt711-l0-rt1316-l12-rt714-l3 support
bardliao Jan 5, 2023
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
8 changes: 5 additions & 3 deletions tools/topology/topology2/avs-tplg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-cavs-sdw.bin"
"cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMPS=2,SDW_DMIC=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt711-rt1316-rt714.bin"

"cavs-sdw\;sof-adl-rt711-l0-rt1316-l12-rt714-l3\;NUM_SDW_AMPS=2,SDW_DMIC=1"

# IPC4 topology for TGL rt711 Headset + rt1308 Amplifier + rt715 DMIC
"cavs-sdw\;sof-tgl-rt715-rt711-rt1308-mono\;NUM_SDW_AMPS=1,SDW_DMIC=1,\
SDW_JACK_OUT_STREAM=SDW1-Playback,SDW_JACK_IN_STREAM=SDW1-Capture,\
SDW_SPK_STREAM=SDW2-Playback,SDW_DMIC_STREAM=SDW0-Capture,\
SDW_SPK_STREAM=SDW2-Playback,SDW_DMIC_STREAM=SDW0-Capture,SDW_AMP_FEEDBACK=false,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt715-rt711-rt1308-mono.bin"

# IPC4 topology for TGL rt711 Headset + rt1308 Amplifier + PCH DMIC
"cavs-sdw\;sof-tgl-rt711-rt1308-4ch\;NUM_SDW_AMPS=1,NUM_DMICS=4,DMIC0_ID=3,\
DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-tgl-rt711-rt1308-4ch.bin"
DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,SDW_AMP_FEEDBACK=false,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-rt711-rt1308-4ch.bin"

"cavs-sdw\;sof-adl-rt711-4ch\;DEEPBUFFER_FW_DMA_MS=100,NUM_DMICS=4,DMIC0_ID=2,\
DMIC1_ID=3,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,HDMI1_ID=4,HDMI2_ID=5,\
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/cavs-sdw-src-gain-mixin.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Define {
#ALH Index: 0, Direction: duplex
Object.Dai.ALH [
{
dai_index 2
Copy link
Collaborator

@ranj063 ranj063 Feb 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the commit message talks about pipeline ID and route ID but all im seeing is dai_index updates.

Copy link
Collaborator Author

@bardliao bardliao Feb 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the commit message talks about pipeline ID and route ID but all im seeing is dai_index updates.

@ranj063 The pipeline ID and route ID is already grouped by f0a0100. This commit follows the same rule for ALH dai index. I will update the commit message to make it more intuition.

dai_index 0
id $PLAYBACK_LINK_ID
direction "playback"
name $SDW_PLAYBACK_PCM
Expand All @@ -53,7 +53,7 @@ Object.Dai.ALH [
}
}
{
dai_index 3
dai_index 10
id $CAPTURE_LINK_ID
direction "capture"
name $SDW_CAPTURE_PCM
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ IncludeByKey.SDW_DMIC {
#ALH Index: 0, Direction: duplex
Object.Dai.ALH [
{
dai_index 2
dai_index 0
id $SDW_JACK_OUT_BE_ID
direction "playback"
name $SDW_JACK_OUT_STREAM
Expand All @@ -120,7 +120,7 @@ Object.Dai.ALH [
}
}
{
dai_index 3
dai_index 10
id $SDW_JACK_IN_BE_ID
direction "capture"
name $SDW_JACK_IN_STREAM
Expand Down
138 changes: 76 additions & 62 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 @@ -8,11 +8,12 @@ Define {
SDW_AMP_BE_ID 2
SDW_AMP_IN_BE_ID 3
AMP_FEEDBACK_CH 2
SDW_AMP_FEEDBACK true
}

Object.Dai.ALH [
{
dai_index 514
dai_index 20
id $SDW_AMP_BE_ID
direction "playback"
name $SDW_SPK_STREAM
Expand All @@ -25,20 +26,6 @@ Object.Dai.ALH [
name "ALH514"
}
}
{
dai_index 515
id $SDW_AMP_IN_BE_ID
direction "capture"
name $SDW_SPK_IN_STREAM
default_hw_conf_id 1
rate 48000
channels 2

Object.Base.hw_config.1 {
id 1
name "ALH515"
}
}
]

Object.Pipeline {
Expand Down Expand Up @@ -75,34 +62,6 @@ Object.Pipeline {
}
]

passthrough-capture [
{
index 30

Object.Widget.copier.1.stream_name "amp feedback"
Object.Widget.copier.1.Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
}
}
]

passthrough-be [
{
direction "capture"
index 31
copier_type "ALH"

Object.Widget.copier.1 {
stream_name $SDW_SPK_IN_STREAM
dai_type "ALH"
copier_type "ALH"
type "dai_out"
node_type $ALH_LINK_INPUT_CLASS
}
}
]
}

IncludeByKey.NUM_SDW_AMPS {
Expand Down Expand Up @@ -159,21 +118,6 @@ Object.PCM.pcm [
formats 'S16_LE,S24_LE,S32_LE'
}
}
{
name "Amp feedback"
id 3
direction "capture"
Object.Base.fe_dai.1 {
name "Amp feedback"
}

Object.PCM.pcm_caps.1 {
name "amp feedback"
formats 'S16_LE,S32_LE'
channels_min $AMP_FEEDBACK_CH
channels_max $AMP_FEEDBACK_CH
}
}
]

Object.Base.route [
Expand All @@ -185,8 +129,78 @@ Object.Base.route [
source 'mixin.20.1'
sink 'mixout.21.1'
}
{
source "copier.ALH.31.1"
sink "copier.host.30.1"
}
]

IncludeByKey.SDW_AMP_FEEDBACK {
"true" {
Object.Dai.ALH [
{
dai_index 30
id $SDW_AMP_IN_BE_ID
direction "capture"
name $SDW_SPK_IN_STREAM
default_hw_conf_id 1
rate 48000
channels 2

Object.Base.hw_config.1 {
id 1
name "ALH515"
}
}
]
Object.Pipeline {
passthrough-capture [
{
index 30

Object.Widget.copier.1.stream_name "amp feedback"
Object.Widget.copier.1.Object.Base.audio_format.1 {
# 32 -> 16 bits conversion is done here,
# so in_bit_depth is 32 (and out_bit_depth is 16).
in_bit_depth 32
}
}
]

passthrough-be [
{
direction "capture"
index 31
copier_type "ALH"

Object.Widget.copier.1 {
stream_name $SDW_SPK_IN_STREAM
dai_type "ALH"
copier_type "ALH"
type "dai_out"
node_type $ALH_LINK_INPUT_CLASS
}
}
]
}
Object.PCM.pcm [
{
name "Amp feedback"
id 3
direction "capture"
Object.Base.fe_dai.1 {
name "Amp feedback"
}

Object.PCM.pcm_caps.1 {
name "amp feedback"
formats 'S16_LE,S32_LE'
channels_min $AMP_FEEDBACK_CH
channels_max $AMP_FEEDBACK_CH
}
}
]
Object.Base.route [
{
source "copier.ALH.31.1"
sink "copier.host.30.1"
}
]
}
}
2 changes: 1 addition & 1 deletion tools/topology/topology2/platform/intel/sdw-dmic-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Define {

Object.Dai.ALH [
{
dai_index 771
dai_index 40
id $SDW_DMIC_BE_ID
direction "capture"
name $SDW_DMIC_STREAM
Expand Down