Skip to content
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

[MTL-005] Cherry pick recent topology updates #7582

Merged

Conversation

mengdonglin
Copy link
Collaborator

@mengdonglin mengdonglin commented May 10, 2023

Cherry pick the following topology2 updates from main branch to mtl-005-drop-stable:
04749b9 topology2: dmic-generic: add macro for DMIC_CORE_ID
a3cb46d topology2: cavs-sdw: make jack optional
74f3246 topology2: cavs-nocodec: add a module copier to SSP 0 capture pipeline
3c39c2c topology2: cavs-sdw: Enable PDM 1 mics for 4ch
dfe52aa Tools: Topology2: SRC format fixes
fabeb63 Topology2: Add mtl-rt711-l0-rt1316-l23-rt714-l1 support
d3e3943 Topology2: add comment to separate chromebook topology clearly
0140c43 topology2: Set the deepbuffer PCM D0i3 compatibility conditionally

v2:
c605296 topology2: add multicore support for CI test

ranj063 and others added 2 commits May 10, 2023 04:52
Set the deep buffer PCM as D0I3 compatible only for MTL.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
(cherry picked from commit 0140c43)
Add a single comment to separate chromebook topologies
from non-chromebook topologies.

Signed-off-by: Chao Song <chao.song@linux.intel.com>
(cherry picked from commit d3e3943)
@mengdonglin
Copy link
Collaborator Author

mengdonglin commented May 10, 2023

@ranj063 @jsarha @marcinszkudlinski @yongzhi1 @aiChaoSONG @kv2019i This is to sync recent topology updates from main branch.
We still need one more multi-core topology update: #7509

This topology could be used by MTL SDW RVP with 3-in-1
SDCA codec board, or other hardware configuration with
the same codec layout:
    SDW0: RT711 Headphone
    SDW1: RT714 DMIC
    SDW2: RT1316 Speaker
    SDW3: RT1316 Speaker

Signed-off-by: Chao Song <chao.song@linux.intel.com>
(cherry picked from commit fabeb63)
ranj063 and others added 5 commits May 10, 2023 04:53
This patch avoids with development topology sof-hda-src-generic.tplg
the playback start failure and error seen in trace
"buffer: buffer_alloc(): new size = 0 is invalid".

The kernel selects in case of multiple output formats defined the
format that matches the input. It then caused the obs to become zero.
When the SRC is used in the mixin-based playback pipeline, its output
format is limited to 32-bits format only. So replace the multiple
output formats with a single 48K, 2ch 32-bit format.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
(cherry picked from commit dfe52aa)
It would be better to make these dependedent on NUM_DMICS. Something to
improve in a follow up PR.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
(cherry picked from commit 3c39c2c)
Add a module copier between the DAI copier and gain in preparation for
optimizing the single endpoint DAI copiers. This optimization will
temporarily make multiple sinks unsupported with DAI copiers. This
feature will be re-introduced in a follow up PR and the module copier
will be removed then.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
(cherry picked from commit 74f3246)
We assume sdw jack is always there in a sdw topology. This commit
makes it be optional to deal with the sdw amp only case.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
(cherry picked from commit a3cb46d)
Add macros to quickly enable multi-core with DMICs.

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
(cherry picked from commit 04749b9)
@mengdonglin
Copy link
Collaborator Author

@ranj063 The v2 PR also cherry pick multi-core test topology
c605296 topology2: add multicore support for CI test

Can you please give a review? Are there kernel dependency for these recent topology updates?

create another topology to test multicore since Currently we have done
too much work in cavs-nocodec and CI test will be failed for main branch
is not ready for multicore feature.

Signed-off-by: Rander Wang <rander.wang@intel.com>
(cherry picked from commit c605296)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants