Skip to content

tools: topology2: move deepbuffer defaults to separate file #10226

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 2 commits into from
Sep 10, 2025
Merged

tools: topology2: move deepbuffer defaults to separate file #10226

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
79c5873
tools: topology2: move deepbuffer defaults to separate file
kv2019i Sep 9, 2025
4dd67e9
tools: topology2: change the default deep buffer speaker PCM name
kv2019i Sep 9, 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
1 change: 1 addition & 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 @@ -52,6 +52,7 @@
<output_audio_format.conf>
<dmic-default.conf>
<ssp-default.conf>
<deep-buffer-default.conf>

Define {
MCLK 24576000
Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/cavs-rt5682.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<dmic-default.conf>
<hdmi-default.conf>
<bt-default.conf>
<deep-buffer-default.conf>
<input_pin_binding.conf>
<output_pin_binding.conf>
<input_audio_format.conf>
Expand Down
6 changes: 6 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 @@ -48,6 +48,7 @@
<intel/ssp_aux_config.conf>
<ssp.conf>
<bt-default.conf>
<deep-buffer-default.conf>

Define {
PLATFORM "none"
Expand All @@ -70,6 +71,11 @@ Define {
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'
DEEP_BUFFER_PIPELINE_SINK 'mixout.1.1'
DEEP_BUFFER_PCM_NAME 'Deepbuffer Jack Out'
DEEP_BUFFER_PIPELINE_ID_2 16
DEEP_BUFFER_PCM_ID_2 35
Copy link
Collaborator Author

@kv2019i kv2019i Sep 9, 2025

Choose a reason for hiding this comment

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

some typos in git commit, will fix:

  • this also changes the defaults, need to address that (not just SDW)
  • will need to add a note this will not change the name for old I2S topologies (these have been shipping for some time and will be a bigger problem if the PCM name changes)

DEEP_BUFFER_PIPELINE_SRC_2 'mixin.16.1'
DEEP_BUFFER_PIPELINE_SINK_2 'mixout.21.1'
DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Speaker'
Copy link
Member

@lgirdwood lgirdwood Sep 9, 2025

Choose a reason for hiding this comment

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

I know we are doing more of a mechanical move in this PR, but I think it makes sense to look at our _ID_n and align them with a string name.

SDW_JACK_OUT_STREAM 'SDW0-Playback'
SDW_JACK_IN_STREAM 'SDW0-Capture'
SDW_JACK_OUT_BE_ID 0
Expand Down
8 changes: 8 additions & 0 deletions tools/topology/topology2/platform/intel/deep-buffer-default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# default settings for Deep Buffer Speaker
Define {
DEEP_BUF_SPK false
DEEP_BUF_JACK_RATE 48000

DEEP_BUFFER_PCM_NAME 'Deepbuffer Jack Out'
DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Speaker'
}
9 changes: 0 additions & 9 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,7 +1,3 @@
Define {
DEEP_BUF_SPK false
DEEP_BUF_JACK_RATE 48000
}

Object.Pipeline.deepbuffer-playback [
{
Expand Down Expand Up @@ -126,11 +122,6 @@ Object.Base.route [
IncludeByKey.DEEP_BUF_SPK {
"true" {
Define {
DEEP_BUFFER_PIPELINE_ID_2 16
DEEP_BUFFER_PCM_ID_2 35
DEEP_BUFFER_PIPELINE_SRC_2 'mixin.16.1'
DEEP_BUFFER_PIPELINE_SINK_2 'mixout.21.1'
DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Amps'
SPEAKER_PCM_CORE_ID 0
Copy link

Copilot AI Sep 9, 2025

Choose a reason for hiding this comment

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

The removal of DEEP_BUFFER_PIPELINE_ID_2, DEEP_BUFFER_PCM_ID_2, DEEP_BUFFER_PIPELINE_SRC_2, DEEP_BUFFER_PIPELINE_SINK_2, and DEEP_BUFFER_PCM_NAME_2 definitions from this conditional block may cause undefined variable errors when DEEP_BUF_SPK is true, since these variables are still referenced in the pipeline configuration below but are no longer defined here.

Suggested change
SPEAKER_PCM_CORE_ID 0
SPEAKER_PCM_CORE_ID 0
DEEP_BUFFER_PIPELINE_ID_2 2
DEEP_BUFFER_PCM_ID_2 2
DEEP_BUFFER_PIPELINE_SRC_2 host-copier.$DEEP_BUFFER_PCM_ID_2.playback
DEEP_BUFFER_PIPELINE_SINK_2 gain.$DEEP_BUFFER_PIPELINE_ID_2.1
DEEP_BUFFER_PCM_NAME_2 "Deep Buffer Playback 2"

Copilot uses AI. Check for mistakes.
}

Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/sof-hda-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<common_definitions.conf>
<dmic-default.conf>
<hdmi-default.conf>
<deep-buffer-default.conf>
<module-copier.conf>

Define {
Expand Down
Loading