From fad22b4936f0227456bb7660795ae7c07d9c1c8f Mon Sep 17 00:00:00 2001
From: Jun Lai <jun.lai@dolby.com>
Date: Tue, 18 Nov 2025 15:29:33 +0800
Subject: [PATCH] tools: topology: add dax module to ptl topologies

Added sof-ptl-cs42l43-agg-l3-cs35l56-l2-dax.tplg for
PTL platform.

(cherry picked from commit 42d947293)
Signed-off-by: Jun Lai <jun.lai@dolby.com>
---
 app/overlays/ptl/dax_overlay.conf             |   8 ++
 tools/rimage/config/ptl.toml.h                |   4 +
 tools/topology/topology2/cavs-sdw.conf        |   3 +
 ...xout-gain-dax-alh-dai-copier-playback.conf | 130 ++++++++++++++++++
 .../platform/intel/sdw-amp-generic.conf       |  96 ++++++++++++-
 .../platform/intel/sdw-jack-generic.conf      | 127 ++++++++++++++++-
 .../production/tplg-targets-ace3.cmake        |   6 +
 7 files changed, 364 insertions(+), 10 deletions(-)
 create mode 100644 app/overlays/ptl/dax_overlay.conf
 create mode 100644 tools/topology/topology2/include/pipelines/cavs/mixout-gain-dax-alh-dai-copier-playback.conf

diff --git a/app/overlays/ptl/dax_overlay.conf b/app/overlays/ptl/dax_overlay.conf
new file mode 100644
index 000000000000..9211e845cc36
--- /dev/null
+++ b/app/overlays/ptl/dax_overlay.conf
@@ -0,0 +1,8 @@
+CONFIG_COMP_MODULE_ADAPTER=y
+CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING=y
+CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING_MOCK=n
+CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
+CONFIG_SOF_STACK_SIZE=8192
+
+# LLEXT
+CONFIG_LLEXT_HEAP_SIZE=32
diff --git a/tools/rimage/config/ptl.toml.h b/tools/rimage/config/ptl.toml.h
index 1a447c93c1c1..4be78f07b325 100644
--- a/tools/rimage/config/ptl.toml.h
+++ b/tools/rimage/config/ptl.toml.h
@@ -102,6 +102,10 @@ index = __COUNTER__
 #include <audio/aria/aria.toml>
 #endif
 
+#if defined(CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING) || defined(LLEXT_FORCE_ALL_MODULAR)
+#include <audio/module_adapter/module/dolby/dax.toml>
+#endif
+
 #if defined(CONFIG_COMP_DRC) || defined(LLEXT_FORCE_ALL_MODULAR)
 #include <audio/drc/drc.toml>
 #endif
diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf
index 26ce5e9f0d89..7f82690a31cb 100644
--- a/tools/topology/topology2/cavs-sdw.conf
+++ b/tools/topology/topology2/cavs-sdw.conf
@@ -13,6 +13,7 @@
 <virtual.conf>
 <host-copier-gain-mixin-playback.conf>
 <mixout-gain-alh-dai-copier-playback.conf>
+<mixout-gain-dax-alh-dai-copier-playback.conf>
 <mixout-gain-micsel-eqiir-eqfir-alh-dai-copier-playback.conf>
 <mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback.conf>
 <mixout-gain-eqiir-eqfir-drc-micsel-eqiir-eqfir-alh-dai-copier-playback.conf>
@@ -105,6 +106,8 @@ Define {
 	SDW_AMP_XOVER_SELECTOR_PARAMS default
 	SDW_AMP_XOVER_EQIIR_PARAMS default
 	SDW_AMP_XOVER_EQFIR_PARAMS default
+	DOLBY_DAX_CORE_ID 0
+	USE_DAX "false"
 }
 
 # override defaults with platform-specific config
diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dax-alh-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dax-alh-dai-copier-playback.conf
new file mode 100644
index 000000000000..71c367e48481
--- /dev/null
+++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dax-alh-dai-copier-playback.conf
@@ -0,0 +1,130 @@
+#
+# BE playback pipeline: mixout-gain-dax-alh-dai-copier.
+#
+# All attributes defined herein are namespaced
+# by alsatplg to "Object.Pipeline.mixout-gain-dax-alh-dai-copier-playback.N.attribute_name"
+#
+# Usage: mixout-gain-dax-alh-dai-copier-playback pipeline object can be instantiated as:
+#
+# Object.Pipeline.mixout-gain-dax-alh-dai-copier-playback."N" {
+# 	time_domain	"timer"
+# }
+#
+# Where N is the unique pipeline ID within the same alsaconf node.
+#
+
+<include/components/alh-dai-copier.conf>
+<include/components/dolby-dax.conf>
+<include/components/gain.conf>
+<include/components/mixout.conf>
+<include/components/pipeline.conf>
+
+Class.Pipeline."mixout-gain-dax-alh-dai-copier-playback" {
+
+	<include/pipelines/pipeline-common.conf>
+
+	attributes {
+		!constructor [
+			"index"
+		]
+
+		!immutable [
+			"direction"
+		]
+
+		#
+		# mixout-gain-dax-alh-dai-copier-playback objects instantiated within the same alsaconf
+		#  node must have unique instance attribute
+		#
+		unique	"instance"
+	}
+
+	Object.Widget {
+		mixout."1" {}
+		alh-copier."1" {
+			type dai_in
+			num_input_audio_formats 1
+			num_output_audio_formats 1
+			num_input_pins 1
+
+			# copier only supports one format based on mixin/mixout requirements:
+			# 32-bit 48KHz 2ch
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					in_sample_type		$SAMPLE_TYPE_MSB_INTEGER
+					in_fmt_cfg		"$[($in_channels | ($in_valid_bit_depth * 256))]"
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					out_sample_type		$SAMPLE_TYPE_MSB_INTEGER
+					out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
+				}
+			]
+		}
+		gain."1" {
+			num_input_audio_formats 1
+			num_output_audio_formats 1
+
+			# 32-bit 48KHz 2ch
+			Object.Base.input_audio_format [
+				{
+					in_bit_depth		32
+					in_valid_bit_depth	32
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_bit_depth		32
+					out_valid_bit_depth	32
+				}
+			]
+		}
+		dolby-dax."1" {
+			num_input_audio_formats 1
+			num_output_audio_formats 1
+			Object.Base.input_audio_format [
+				{
+					in_rate			48000
+					in_bit_depth		32
+					in_valid_bit_depth	32
+					ibs			"$[(256 * ($[($in_bit_depth / 8)])) * ($in_channels)]"
+				}
+			]
+			Object.Base.output_audio_format [
+				{
+					out_rate		48000
+					out_bit_depth		32
+					out_valid_bit_depth	32
+					obs			"$[(256 * ($[($out_bit_depth / 8)])) * ($out_channels)]"
+				}
+			]
+		}
+
+		pipeline."1" {
+			priority 0
+			lp_mode 0
+		}
+	}
+
+	Object.Base {
+		!route [
+			{
+				source  gain.$index.1
+				sink	dolby-dax.$index.1
+			}
+			{
+				source  mixout.$index.1
+				sink	gain.$index.1
+			}
+		]
+	}
+
+	direction	"playback"
+	dynamic_pipeline 1
+	time_domain	"timer"
+}
diff --git a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf
index 01247cb0972f..653a42b8da86 100644
--- a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf
+++ b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf
@@ -99,6 +99,76 @@ IncludeByKey.PASSTHROUGH {
 
 		IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
                         "true" {
+				IncludeByKey.USE_DAX {
+				"true" {
+				mixout-gain-dax-alh-dai-copier-playback [
+					{
+						index 21
+
+						Object.Widget.alh-copier.1 {
+							stream_name $SDW_SPK_STREAM
+							node_type $ALH_LINK_OUTPUT_CLASS
+							num_input_audio_formats 3
+							Object.Base.input_audio_format [
+								{
+									in_bit_depth            16
+									in_valid_bit_depth      16
+								}
+								{
+									in_bit_depth            32
+									in_valid_bit_depth      24
+								}
+								{
+									in_bit_depth            32
+									in_valid_bit_depth      32
+								}
+							]
+							num_output_audio_formats 1
+							Object.Base.output_audio_format [
+								{
+									out_bit_depth           32
+									out_valid_bit_depth     $SDW_LINK_VALID_BITS
+									out_sample_type		$SAMPLE_TYPE_MSB_INTEGER
+									out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256))]"
+								}
+							]
+						}
+						Object.Widget.gain.1 {
+							Object.Control.mixer.1 {
+								name 'Post Mixer $AMP_PLAYBACK_NAME Volume'
+							}
+						}
+						Object.Widget.dolby-dax.1 {
+							core_id $DOLBY_DAX_CORE_ID
+							Object.Control {
+								mixer."1" {
+									name 'DAX Speaker Switch'
+								}
+								mixer."2" {
+									name 'DAX Speaker Switch CP'
+								}
+								mixer."3" {
+									name 'DAX Speaker Switch CTC'
+								}
+								mixer."4" {
+									name 'DAX Speaker Volume'
+								}
+								enum."1" {
+									name 'DAX Speaker Profile'
+								}
+								enum."2" {
+									name 'DAX Speaker Device'
+								}
+								bytes."1" {
+									name 'DAX Speaker Tuning'
+									max 8192
+								}
+							}
+						}
+					}
+				]
+				}
+				"false" {
                                 mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback [
                                         {
                                                 index 21
@@ -159,6 +229,8 @@ IncludeByKey.PASSTHROUGH {
                                                 }
                                         }
                                 ]
+				}
+				}
                         }
                         "false" {
                                 mixout-gain-alh-dai-copier-playback [
@@ -639,12 +711,24 @@ IncludeByKey.PASSTHROUGH {
 "false" {
         IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
                 "true" {
-                        Object.Base.route [
-                                {
-                                        source	"drc.21.1"
-                                        sink	"alh-copier.$SDW_SPK_STREAM.0"
-                                }
-                        ]
+                        IncludeByKey.USE_DAX {
+							"true" {
+								Object.Base.route [
+									{
+										source	"dolby-dax.21.1"
+										sink	"alh-copier.$SDW_SPK_STREAM.0"
+									}
+								]
+							}
+							"false" {
+								Object.Base.route [
+									{
+										source	"drc.21.1"
+										sink	"alh-copier.$SDW_SPK_STREAM.0"
+									}
+								]
+							}
+						}
                 }
                 "false" {
                         Object.Base.route [
diff --git a/tools/topology/topology2/platform/intel/sdw-jack-generic.conf b/tools/topology/topology2/platform/intel/sdw-jack-generic.conf
index e9ac2a24e3bb..841b417be16c 100644
--- a/tools/topology/topology2/platform/intel/sdw-jack-generic.conf
+++ b/tools/topology/topology2/platform/intel/sdw-jack-generic.conf
@@ -159,7 +159,110 @@ IncludeByKey.PASSTHROUGH {
 				}
 			}
 		]
+		IncludeByKey.USE_DAX {
+		"true" {
+		mixout-gain-dax-alh-dai-copier-playback [
+			{
+				index 1
 
+				Object.Widget.mixout.1 {
+					Object.Base.input_audio_format [
+						{
+							in_rate			$JACK_RATE
+							in_bit_depth            32
+							in_valid_bit_depth      32
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$JACK_RATE
+							out_bit_depth		32
+							out_valid_bit_depth	32
+						}
+					]
+				}
+				Object.Widget.alh-copier.1 {
+					stream_name $SDW_JACK_OUT_STREAM
+					node_type $ALH_LINK_OUTPUT_CLASS
+					num_input_audio_formats 3
+					Object.Base.input_audio_format [
+						{
+							in_rate		$JACK_RATE
+							in_bit_depth            16
+							in_valid_bit_depth      16
+						}
+						{
+							in_rate		$JACK_RATE
+							in_bit_depth            32
+							in_valid_bit_depth      24
+						}
+						{
+							in_rate		$JACK_RATE
+							in_bit_depth            32
+							in_valid_bit_depth      32
+						}
+					]
+					num_output_audio_formats 1
+					Object.Base.output_audio_format [
+						{
+							out_rate		$JACK_RATE
+							out_bit_depth           32
+							out_valid_bit_depth     $SDW_LINK_VALID_BITS
+							out_sample_type		$SAMPLE_TYPE_MSB_INTEGER
+							out_fmt_cfg		"$[($out_channels | ($out_valid_bit_depth * 256)) | ($out_sample_type * 65536)]"
+						}
+					]
+				}
+				Object.Widget.gain.1 {
+					Object.Control.mixer.1 {
+						name 'Post Mixer $JACK_PLAYBACK_PCM_NAME Playback Volume'
+					}
+					Object.Base.input_audio_format [
+						{
+							in_rate			$JACK_RATE
+							in_bit_depth            32
+							in_valid_bit_depth      32
+						}
+					]
+					Object.Base.output_audio_format [
+						{
+							out_rate		$JACK_RATE
+							out_bit_depth		32
+							out_valid_bit_depth	32
+						}
+					]
+				}
+				Object.Widget.dolby-dax.1 {
+					core_id $DOLBY_DAX_CORE_ID
+					Object.Control {
+						mixer."1" {
+							name 'DAX Headphone Switch'
+						}
+						mixer."2" {
+							name 'DAX Headphone Switch CP'
+						}
+						mixer."3" {
+							name 'DAX Headphone Switch CTC'
+						}
+						mixer."4" {
+							name 'DAX Headphone Volume'
+						}
+						enum."1" {
+							name 'DAX Headphone Profile'
+						}
+						enum."2" {
+							name 'DAX Headphone Device'
+						}
+						bytes."1" {
+							name 'DAX Headphone Tuning'
+							max 8192
+						}
+					}
+				}
+			}
+		]
+		}
+		"false" {
 		mixout-gain-alh-dai-copier-playback [
 			{
 				index 1
@@ -233,6 +336,8 @@ IncludeByKey.PASSTHROUGH {
 				}
 			}
 		]
+		}
+		}
 	}
 }
 "true" {
@@ -549,11 +654,25 @@ Object.PCM.pcm [
 
 IncludeByKey.PASSTHROUGH {
 "false" {
-	Object.Base.route [
-		{
-			source	"gain.1.1"
-			sink	"alh-copier.$SDW_JACK_OUT_STREAM.0"
+	IncludeByKey.USE_DAX {
+		"true" {
+			Object.Base.route [
+				{
+					source	"dolby-dax.1.1"
+					sink	"alh-copier.$SDW_JACK_OUT_STREAM.0"
+				}
+			]
 		}
+		"false" {
+			Object.Base.route [
+				{
+					source	"gain.1.1"
+					sink	"alh-copier.$SDW_JACK_OUT_STREAM.0"
+				}
+			]
+		}
+	}
+	Object.Base.route [
 		{
 			source "mixin.0.1"
 			sink "mixout.1.1"
diff --git a/tools/topology/topology2/production/tplg-targets-ace3.cmake b/tools/topology/topology2/production/tplg-targets-ace3.cmake
index be2040b78063..2c0927ed8fa7 100644
--- a/tools/topology/topology2/production/tplg-targets-ace3.cmake
+++ b/tools/topology/topology2/production/tplg-targets-ace3.cmake
@@ -108,6 +108,12 @@ 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-cs42l43-agg-l3-cs35l56-l2-dax\;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,\
+DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
+SDW_SPK_ENHANCED_PLAYBACK=true,USE_DAX=true,DOLBY_DAX_CORE_ID=0"
+
 # SSP codec topologies for PTL
 # ES83x6 codec alone without HDMI-in capture
 "cavs-es83x6\;sof-ptl-es8336-ssp1\;PLATFORM=ptl,PREPROCESS_PLUGINS=nhlt,\