From 79c587343caf077d57a9f1b889abce20c93d26a3 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 9 Sep 2025 13:30:03 +0300 Subject: [PATCH 1/2] tools: topology2: move deepbuffer defaults to separate file Follow similar split between defaults and defitinions for deep buffer as has been used for Bluetooth, HDMI and other optional features features. This fixes a regression in commit b6ee40985681 ("Topology2: Add sof-ptl-rt712-l3-rt1320-l3/-4ch support"). This commit changed the defaults to match DSP topology of cavs-sdw.conf and broke topologies based on cavs-rt5682.conf. cavs-rt5682.conf had correct settings, but these were ignored as deep-buffer.conf is included in wrong order. Signed-off-by: Kai Vehmanen --- tools/topology/topology2/cavs-nocodec.conf | 1 + tools/topology/topology2/cavs-rt5682.conf | 1 + tools/topology/topology2/cavs-sdw.conf | 6 ++++++ .../topology2/platform/intel/deep-buffer-default.conf | 8 ++++++++ tools/topology/topology2/platform/intel/deep-buffer.conf | 9 --------- tools/topology/topology2/sof-hda-generic.conf | 1 + 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 tools/topology/topology2/platform/intel/deep-buffer-default.conf diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index 398b0f86abb9..1795fdb12668 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -52,6 +52,7 @@ + Define { MCLK 24576000 diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index 13612730599a..d8e028775aeb 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -45,6 +45,7 @@ + diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index 4a88c4bd0bad..0b0c766daa46 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -48,6 +48,7 @@ + Define { PLATFORM "none" @@ -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 + DEEP_BUFFER_PIPELINE_SRC_2 'mixin.16.1' + DEEP_BUFFER_PIPELINE_SINK_2 'mixout.21.1' + DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Amps' SDW_JACK_OUT_STREAM 'SDW0-Playback' SDW_JACK_IN_STREAM 'SDW0-Capture' SDW_JACK_OUT_BE_ID 0 diff --git a/tools/topology/topology2/platform/intel/deep-buffer-default.conf b/tools/topology/topology2/platform/intel/deep-buffer-default.conf new file mode 100644 index 000000000000..3735db793aca --- /dev/null +++ b/tools/topology/topology2/platform/intel/deep-buffer-default.conf @@ -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 Amps' +} diff --git a/tools/topology/topology2/platform/intel/deep-buffer.conf b/tools/topology/topology2/platform/intel/deep-buffer.conf index 1003d2c3c0c7..282210baaac9 100644 --- a/tools/topology/topology2/platform/intel/deep-buffer.conf +++ b/tools/topology/topology2/platform/intel/deep-buffer.conf @@ -1,7 +1,3 @@ -Define { - DEEP_BUF_SPK false - DEEP_BUF_JACK_RATE 48000 -} Object.Pipeline.deepbuffer-playback [ { @@ -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 } diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index a84eae3fd27f..e73ba0634b77 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -40,6 +40,7 @@ + Define { From 4dd67e980edd469ca0c50befe1ad2bb515843432 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 9 Sep 2025 13:46:06 +0300 Subject: [PATCH 2/2] tools: topology2: change the default deep buffer speaker PCM name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the default PCM name for deep buffer speaker to "Deepbuffer Speaker". After this change, the naming is more consistent: - Jack Out - Speaker - Deepbuffer Jack Out - Deepbuffer Speaker Keep the existing topologies based on cavs-rt5682.conf unaffected (keep using old "Deepbuffer Amps" PCM name) as these are widely used. Deep buffer has so far been enabled only in one Soundwire based configuration (sof-ptl-rt712-l3-rt1320-l3-4ch.tplg). Change the PCM name as this is not yet referred in any upstream UCM definition yet. Suggest-by: Péter Ujfalusi Signed-off-by: Kai Vehmanen --- tools/topology/topology2/cavs-sdw.conf | 2 +- .../topology/topology2/platform/intel/deep-buffer-default.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index 0b0c766daa46..d16ab0ca4492 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -75,7 +75,7 @@ Define { 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' + DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Speaker' SDW_JACK_OUT_STREAM 'SDW0-Playback' SDW_JACK_IN_STREAM 'SDW0-Capture' SDW_JACK_OUT_BE_ID 0 diff --git a/tools/topology/topology2/platform/intel/deep-buffer-default.conf b/tools/topology/topology2/platform/intel/deep-buffer-default.conf index 3735db793aca..35d0977bf3c9 100644 --- a/tools/topology/topology2/platform/intel/deep-buffer-default.conf +++ b/tools/topology/topology2/platform/intel/deep-buffer-default.conf @@ -4,5 +4,5 @@ Define { DEEP_BUF_JACK_RATE 48000 DEEP_BUFFER_PCM_NAME 'Deepbuffer Jack Out' - DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Amps' + DEEP_BUFFER_PCM_NAME_2 'Deepbuffer Speaker' }