From 43bc9547da47cea9432072b576e86687bf1ea699 Mon Sep 17 00:00:00 2001
From: Rander Wang <rander.wang@intel.com>
Date: Fri, 15 Sep 2023 16:44:51 +0800
Subject: [PATCH] topology2: set pipeline priority for google aec stream

Set priority for aec stream so that driver can trigger pipeline based on
pipeline priority.

Signed-off-by: Rander Wang <rander.wang@intel.com>
---
 tools/topology/topology2/cavs-rt5682.conf                     | 4 ++++
 tools/topology/topology2/platform/intel/dmic-default.conf     | 1 +
 tools/topology/topology2/platform/intel/dmic-generic.conf     | 1 +
 .../topology2/platform/intel/google-rtc-aec-reference.conf    | 2 ++
 tools/topology/topology2/platform/intel/speaker-echo-ref.conf | 3 ++-
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
index f3cdc8d47aeb..ab1afe660c44 100644
--- a/tools/topology/topology2/cavs-rt5682.conf
+++ b/tools/topology/topology2/cavs-rt5682.conf
@@ -103,6 +103,10 @@ Define {
 	SPEAKER_PCM_NAME		"Speakers"
 	SPEAKER_PCM_ID			1
 	INCLUDE_BT_OFFLOAD		true
+	GOOGLE_AEC_HOST_PIPELINE_PRIORITY	3
+	GOOGLE_AEC_PIPELINE_PRIORITY	2
+	DMIC_PIPELINE_PRIORITY		1
+	ECHO_REF_PIPELINE_PRIORITY	0
 }
 
 # override defaults with platform-specific config
diff --git a/tools/topology/topology2/platform/intel/dmic-default.conf b/tools/topology/topology2/platform/intel/dmic-default.conf
index 3f1e23526bc5..0bbb288e9e03 100644
--- a/tools/topology/topology2/platform/intel/dmic-default.conf
+++ b/tools/topology/topology2/platform/intel/dmic-default.conf
@@ -35,4 +35,5 @@ Define {
 	DMIC1_PCM_CAPS			'Passthrough Capture 18'
 	DMIC_CORE_ID			0
 	PASSTHROUGH			"false"
+	DMIC_PIPELINE_PRIORITY		0
 }
diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf
index 006505ca011f..a83d2aeb959b 100644
--- a/tools/topology/topology2/platform/intel/dmic-generic.conf
+++ b/tools/topology/topology2/platform/intel/dmic-generic.conf
@@ -180,6 +180,7 @@ IncludeByKey.PASSTHROUGH {
 				}
 				Object.Widget.pipeline."1" {
 					core $DMIC_CORE_ID
+					priority $DMIC_PIPELINE_PRIORITY
 				}
 			}
 		]
diff --git a/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf b/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
index b2e9a88ec1e9..38f0e9077f87 100644
--- a/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
+++ b/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
@@ -6,6 +6,7 @@ Object.Pipeline.google-rtc-aec-capture [
 		Object.Widget.pipeline.1 {
 			stream_name "DMIC0 RTC AEC"
 			core $GOOGLE_AEC_CORE_ID
+			priority $GOOGLE_AEC_PIPELINE_PRIORITY
 		}
 
 		Object.Widget.google-rtc-aec.1 {
@@ -31,6 +32,7 @@ Object.Pipeline.host-gateway-capture[
                 }
                 Object.Widget.pipeline."1" {
 			core $GOOGLE_AEC_CORE_ID
+			priority $GOOGLE_AEC_HOST_PIPELINE_PRIORITY
 		}
         }
 ]
diff --git a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
index 2ff5f3e22e5e..7299b7e149f7 100644
--- a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
+++ b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
@@ -41,7 +41,8 @@ Object.Pipeline {
 				}
 			}
 			Object.Widget.pipeline."1" {
-				core	$ECHO_REF_CORE_ID
+				core		$ECHO_REF_CORE_ID
+				priority	$ECHO_REF_PIPELINE_PRIORITY
 			}
 		}
 	]