Skip to content
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

Topology2: add sof-ptl-rt722-96k support #9679

Merged
merged 2 commits into from
Nov 27, 2024
+71 −0
Merged

Topology2: add sof-ptl-rt722-96k support #9679

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
a18fc3d
Topology2: add more rates support for deep buffer jack
bardliao Nov 25, 2024
d260b50
Topology2: add sof-ptl-rt722-96k support
bardliao Nov 25, 2024
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
66 changes: 66 additions & 0 deletions tools/topology/topology2/platform/intel/deep-buffer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Define {
DEEP_BUF_SPK false
DEEP_BUF_JACK_RATE 48000
}

Object.Pipeline.deepbuffer-playback [
Expand All @@ -9,12 +10,66 @@ Object.Pipeline.deepbuffer-playback [
Object.Widget.host-copier.1 {
stream_name $DEEP_BUFFER_PCM_NAME
pcm_id $DEEP_BUFFER_PCM_ID
Object.Base.input_audio_format [
{
in_rate $DEEP_BUF_JACK_RATE
in_bit_depth 16
in_valid_bit_depth 16
}
{
in_rate $DEEP_BUF_JACK_RATE
in_bit_depth 32
in_valid_bit_depth 24
}
{
in_rate $DEEP_BUF_JACK_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_rate $DEEP_BUF_JACK_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
]
}

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Pre Mixer $DEEP_BUFFER_PCM_NAME Volume'
}
Object.Base.input_audio_format [
{
in_rate $DEEP_BUF_JACK_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_rate $DEEP_BUF_JACK_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
Object.Widget.mixin.1 {
Object.Base.input_audio_format [
{
in_rate $DEEP_BUF_JACK_RATE
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_rate $DEEP_BUF_JACK_RATE
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
}
]
Expand All @@ -41,6 +96,17 @@ Object.PCM.pcm [
# Note: The lower limit for the buffer size is rate
# dependent
buffer_size_min "$[(((2 * $channels_min) * 48) * $DEEPBUFFER_FW_DMA_MS) * 2]"
IncludeByKey.DEEP_BUF_JACK_RATE {
"48000" {
rates '48000'
}
"96000" {
rates '96000'
}
"192000" {
rates '192000'
}
}
}
}
]
Expand Down
5 changes: 5 additions & 0 deletions tools/topology/topology2/production/tplg-targets-ace3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt721-4ch.bin"
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"

"cavs-sdw\;sof-ptl-rt722-96k\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
JACK_RATE=96000,DEEP_BUF_JACK_RATE=96000"

Copy link
Collaborator

Choose a reason for hiding this comment

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

Is production folder correct place for this? I don't think we have any kernel configuration that would use this out-of-the-box...?

Copy link
Member

Choose a reason for hiding this comment

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

yes production is the right place.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Is production folder correct place for this? I don't think we have any kernel configuration that would use this out-of-the-box...?

Currently, there is no product uses the tplg by default. However, it can be used with options snd-sof-pci tplg_filename=sof-ptl-rt722-96k.tplg

"cavs-sdw\;sof-ptl-rt722-4ch\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,NUM_DMICS=4,\
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
Expand Down
Loading