-
Notifications
You must be signed in to change notification settings - Fork 349
[PTL STABLE] Tools: Topology2: Add topologies builds for PTL #9306
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.
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
[PTL STABLE] Tools: Topology2: Add topologies builds for PTL #9306
Conversation
|
Note: This needs an alsa-utils update that is not yet publicly available. I'm working on a cleaned-up version to be shared soon. |
|
The two commits ending with 4658143 seem to have only topology changes (as expected). Yet most compilation checks have C failures?!? https://github.com/thesofproject/sof/actions/runs/9959983293/job/27518100450?pr=9306 https://github.com/thesofproject/sof/actions/runs/9959983317/job/27518101723?pr=9306 #9305 submitted around the same time is fine. Daily build is fine: https://github.com/thesofproject/sof/actions/runs/9948774464 Something somewhere went terribly wrong.. |
|
OK, I got it. Unlike #9305, this PR is not targeted at the main branch. This gets me EVERY TIME! EDIT: if the ptl-001-drop-stable branch is not temporary, please remove most |
|
I don't think it makes sense to apply topology patches on what is essentially a curated firmware release. We might as well push all the topology changes to main, and do the work once. |
Well, submitting to this branch achieves at least one thing: it publishes the changes without breaking the build on the main branch :-D But yeah: the less branching always the better (branching is just duplication under source control) and this particular divergence does not seem solve any problem besides avoiding the alsa-utils upgrade for the main branch. |
|
@marc-hb @plbossart This PR needs a new version of alsa-utils, so the topologies build produces unusable ones for PTL ACE3.x until updated. The SSP configuration blob format is quite different now from previous platforms. |
43b4ca8 to
18b6ccd
Compare
|
@singalsu, can you include this as well to this PR: From abcf1d6c9943181d7fb851741cee0799460fcc05 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Date: Thu, 18 Jul 2024 09:48:06 +0300
Subject: [PATCH] topology2: development: Add SSP nocodec topology for PTL
Generic SSP topology for PTL.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
tools/topology/topology2/development/tplg-targets.cmake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake
index f4ad040136b5..2942940e57b5 100644
--- a/tools/topology/topology2/development/tplg-targets.cmake
+++ b/tools/topology/topology2/development/tplg-targets.cmake
@@ -55,6 +55,10 @@ NHLT_BIN=nhlt-sof-lnl-nocodec-fpga-4ch.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000
"cavs-sdw\;sof-lnl-fpga-rt711-l0\;PLATFORM=lnl,NUM_HDMIS=0,PASSTHROUGH=true"
+# SSP topology for PTL
+"cavs-nocodec\;sof-ptl-nocodec\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin"
+
# SSP topology for PTL FPGA with lower DMIC IO clock of 19.2MHz, 2ch PDM0 enabled
"cavs-nocodec\;sof-ptl-nocodec-fpga-2ch-pdm0\;PLATFORM=ptl,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-ptl-nocodec-fpga-2ch-pdm0.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000"
--
2.45.2 |
This patch builds test topologies sof-ptl-nocodec.tplg, sof-ptl-nocodec-fpga-2ch-pdm0.tplg, and sof-ptl-nocodec-fpga-4ch.tplg. The changes include: - New ptl.conf where DMIC and SSP versions are updated vs. LNL and MTL. - The definitions for blob 3.0 format are added to instruct alsa-utils to process a new format SSP blob. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
18b6ccd to
0905b1f
Compare
The topology is built into development to be used for testing and further development. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
0905b1f to
6049b29
Compare
|
SOFCI TEST |
|
@lgirdwood This is for ptl-001-drop-stable, so for @mwasko to approve. I think we should submit to mainline first if alsa-utils dependencies are met. @singalsu ? |
Ack - lets upstream in main. |
|
Closing |
No description provided.