From a4ef5f141aa95ee70646e0473329ccf4edde394c Mon Sep 17 00:00:00 2001 From: Mac Chiang Date: Tue, 8 Apr 2025 16:52:22 +0800 Subject: [PATCH 1/2] Topology2: Add missing Deep Buffer Speaker settings These necessary pipeline configurations apply only when deep buffer speaker feature is enabled. Following commit f35420 (Revert "topology2: Update deep buffer and BT offload for ptl rt722 topology") Signed-off-by: Mac Chiang --- tools/topology/topology2/platform/intel/deep-buffer.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/topology/topology2/platform/intel/deep-buffer.conf b/tools/topology/topology2/platform/intel/deep-buffer.conf index 13885f402c82..1003d2c3c0c7 100644 --- a/tools/topology/topology2/platform/intel/deep-buffer.conf +++ b/tools/topology/topology2/platform/intel/deep-buffer.conf @@ -125,6 +125,15 @@ Object.Base.route [ # Spawn another instance 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 + } + Object.Pipeline.deepbuffer-playback [ { index $DEEP_BUFFER_PIPELINE_ID_2 From f1933baff4b1b4c5af68dea99ae1d39f762c068e Mon Sep 17 00:00:00 2001 From: Mac Chiang Date: Thu, 28 Nov 2024 14:38:29 +0800 Subject: [PATCH 2/2] Topology2: Add sof-ptl-rt712-l3-rt1320-l3/-4ch support The topology supports rt712_vb multi-function codec and rt1320 on SoundWire link 3 and shareing the sdw3-clock, sdw3-data[0], sdw3-data[1] data lanes and without/with PCH_DMIC support. Signed-off-by: Mac Chiang --- .../topology2/production/tplg-targets-ace3.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/topology/topology2/production/tplg-targets-ace3.cmake b/tools/topology/topology2/production/tplg-targets-ace3.cmake index fa50ba176258..ff0f1db05fff 100644 --- a/tools/topology/topology2/production/tplg-targets-ace3.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace3.cmake @@ -46,6 +46,19 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack" 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-rt712-l3-rt1320-l3\;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" + +"cavs-sdw\;sof-ptl-rt712-l3-rt1320-l3-4ch\;PLATFORM=ptl,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,\ +SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt712-l3-rt1320-l3-4ch.bin,DMIC0_ENHANCED_CAPTURE=true,\ +EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\ +BT_PCM_ID=20,BT_ID=10,BT_PCM_NAME=Bluetooth,ADD_BT=true,\ +DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true" + "cavs-sdw\;sof-ptl-rt713-l2-rt1320-l13\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=2,\ 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"