Move gain-playback/capture pipelines out of cavs folder
since these can used by others.
Update cavs topologies to fix compilation by adding
include/pipelines as searchdir.
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Move common_definitions.conf to common folder since this
will be used by other companies to define their topologies.
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Add the conf file for the OpenVino noise suppression module and
introduce the module in the capture path in the plugin topology when
noise suppression is enabled. ATM, only 16K capture is supported by the
model, so change the input/output rates for the host/dai modules in the
plugin capture pipeline.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
On 8ULP SAI is connected to BT which supports
only 1 channel for both playback and record.
Fixes: aaff352314 ('topology1: pipe-volume-capture.m4: Set minimum number of channels to 2')
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Add a mute switch to gain widget for DMIC. Also register this switch
as MIC mute LED mixer control on Linux side.
Signed-off-by: Brent Lu <brent.lu@intel.com>
The topology uses passthrough pipelines for playback/capture and
supports only 48k, 2ch, 16bit format for now.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This patch adds build of hda-generic development topologies to
test ASRC component with s32/24/16 format.
Signed-off-by: Andrula Song <andrula.song@intel.com>
Adding make file changes to generate the topology file for the products
which doesn't have no ssp-based audio codec but need to support
HDMI audio playback and HDMI-in capture via I2S.
Signed-off-by: Balamurugan C <balamurugan.c@intel.com>
override the default HDMI DAI link id's by using make
define parameters instead of fixed in file.
Signed-off-by: Balamurugan C <balamurugan.c@intel.com>
Adding HEADSET_CODEC macro and guarded the SSP configuration handling
under this macro.By this changes we can generate the topology
configuration for the products which has no headset codec.
Signed-off-by: Balamurugan C <balamurugan.c@intel.com>
The layout is configured as:
- Link0: CS42L43 Jack and mics
- Link2: 2x CS35L56 Speaker (amps 3 and 4, right)
- Link3: 2x CS35L56 Speaker (amps 1 and 2, left)
Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
Remove the temporary workaround and add HDMI on all MeteorLake
products. If this breaks stuff, well we need to fix hit ASAP.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
The sof-adl-rt711-l0-rt1316-l13-rt714-l2 similar to
sof-adl-rt711-l0-rt1308-l12-rt715-l3 with the SDW DMIC on different link.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
The sof-adl-rt711-l0-rt1308-l12-rt715-l3 is identical configuration as
sof-tgl-rt711-rt1308-rt715
At the same time update the comments for better organization.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
The target name for the production should have been more precise as it
ended up:
ninja -C tools/build_tools/ help
topology2_dev: phony
...
topology2_dev_sof-tgl-nocodec: phony
topology2_dev_sof-tgl-nocodec-crossover-2way: phony
...
topology2_prod: phony
...
topology2_sof-hda-generic: phony
topology2_sof-hda-generic-2ch: phony
...
Change it to be consistent:
topology2_dev: phony
...
topology2_dev_sof-tgl-nocodec: phony
topology2_dev_sof-tgl-nocodec-crossover-2way: phony
...
topology2_prod: phony
...
topology2_prod_sof-hda-generic: phony
topology2_prod_sof-hda-generic-2ch: phony
...
No functional change.
Suggested-by: Marc Herbert <marc.herbert@intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Merge the avs-tplg and sof-ace-tplg under a common production directory.
After a successful build CMake will copy the topology files to a target
directory from where they can be copied to DUT/release:
$ tree tools/build_tools/topology/topology2/target
tools/build_tools/topology/topology2/target
├── development
│ ├── cavs-sdw-hdmi.tplg
│ ├── cavs-sdw-src-gain-mixin.tplg
...
│ ├── sof-tgl-nocodec-rtcaec.tplg
│ └── sof-tgl-nocodec.tplg
├── sof-ace-tplg -> sof-ipc4-tplg
└── sof-ipc4-tplg
├── sof-adl-rt711-4ch.tplg
├── sof-adl-rt711-l0-rt1316-l12-rt714-l3.tplg
...
├── sof-tgl-rt712.tplg
└── sof-tgl-rt715-rt711-rt1308-mono.tplg
The sof-hda-generic-2/4ch.tplg will be generated without embedded NHLT as
it is not used under normal circumstance.
Two flavor of the generic topology is generated for CAVS2.5 and ACE1/2 with
included NHLT binary in case it is used by existing users, but it is
unlikely.
As noted in the documentation, on the deployed system a symlink is needed
for ACE1/2 platforms for backwards compatibility:
sof-ace-tplg -> sof-ipc4-tplg
Link: https://github.com/thesofproject/sof-docs/blob/master/getting_started/intel_debug/introduction.rst#2-topology-file
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
This patch adds build of hda-generic development topologies to
test SRC LITE component with all s16/s24/s32 formats
Signed-off-by: Andrula Song <andrula.song@intel.com>
The default for DEEPBUFFER_FW_DMA_MS is 100, remove the
DEEPBUFFER_FW_DMA_MS parameter set for individual topologies when the value
set is also 100
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
The DeepBuffer stream is D0I3 compatible for some time now on all IPC4
platforms, The CAVS2.5 topologies just did not got updated.
Swap the default for the DEEPBUFFER_D0I3_COMPATIBLE to true.
New, experimental platforms can change this if needed until the feature is
verified.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
This patch adds build of hda-generic development topologies to
test SRC component with s24/16 format.
Signed-off-by: Andrula Song <andrula.song@intel.com>
This patch adds build of hda-generic development topologies to
test SRC component with s32 format.
Signed-off-by: Andrula Song <andrula.song@intel.com>
The pipelines for PCM0 and PCM1 only support S32_LE audio
format. Fix the PCM capability descriptions to match the actual
pipeline definitions. This allows to run test suites that enumerate
all support PCMs and their formats.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
The mixer control for switch is added to widget definition
of drc.conf.
In cavs-mixin-mixout-efx-hda.conf the existing control name
is changed to have "bytes" similarly as multiband-drc has. The
switch control is added for the widget to implement the switch.
The controls definitions files in benchmark topologies are replaced
to new format from current .conf generator script. The bytes control
is same as before, and the mixer control for switch is added.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This blob exercises fully the features of DRC and is
therefore useful for performance evaluation in all
operation regions.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This blob exercises fully the features of DRC and is
therefore good for testbench runs to evaluate performance
in all operation regions.
The pipeline pipe-drc-playback.m4 is used only with testbench
so it is safe to change to use this blob.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch adds build of hda-generic development topologies to
test IGO NR component with all s16/s24/s32 formats.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Currently, the minimum number of channels for the capture PCM
is set to the same value as the maximum number. This restricts
the number of channels supported by the PCM to the maximum number.
This is wrong if we want to allow arecord to work with multiple channel
values. As such, follow the example of "pipe-volume-playback.m4" and
introduce a new macro: LOCAL_CHANNELS_MIN. This will be set to
"CHANNELS_MIN" if said macro is defined, otherwise it will be set to
2.
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Remove the rest of channels and rate attribute values from pipeline
instamces and remove rate attribute definition from
pipeline-common.conf. There was no channels attribute definition in
pipeline-common.conf, not to mention *_min and *_max attributes.
Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
This commit removes all defined values for rate, rate_min, rate_max,
channels, channels_min, and channels_max, from all pipeline
definitions under include/pipelines/cavs. The commit also removes them
from the usage examples in the comments.
The removed pipeline level attribute values are obsolete.
Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Make the HDMI_USE_CHAIN_DMA set to true by default as enabling it for every
configuration just does not scale.
The generic HDA topologies enabled this for all IPC4 platforms already.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
In practice all HDA links (on LNL SDW/SSP/DMIC also) can use ChainDMA, but
the flag is used to enable this only for display links.
Rename the flag to be precise about this.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
From 48k input, the obs for 11025/22050/44100/88200/176400 setting
need take care, previous implementation left 5 words redundancy
for output, this change removed redundancy, since actual output
buffer size always use double obs size.
Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
22050Hz obs also need a separate setting, this was missed when first
create this file, now move it to the group with obs setting.
Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
This patch adds build of hda-generic development topologies to
test RTNR component with all s16/s24/s32 formats.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch allows to build topologies to use the RTNR
component. Two bytes control blobs are converted from
topology1 to IPC4 format.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
To indicate the SoundWire amp need to use 24 bit format.
I use a flag instead of a macro like $SDW_AMP_FMT to set valid_bit_depth
because bit_depth and valid_bit_depth may not be the same.
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
The multi-core topology was created since multi-core feature had a few
bugs at that time so it was for validation test. Now this feature works
fine so merge it into nocodec topology then it will be tested by
github CI. And we don't need to maintain a dedicated multi-core topology.
Signed-off-by: Rander Wang <rander.wang@intel.com>
It was confirmed that the IPC4 version of Google RTC AEC
is not using the bytes control, so it can be safely removed
from topology.
This fixes topologies build error:
ALSA lib conf.c:838:(get_char_skip_comments)
Cannot access file include/components/google-rtc-aec/rtc-aec-blob.conf
Fixes: 64fcebbd64
("Tools: Topology2: Add nocodec topology to test google-rtc-aec")
Fixes: #8357
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This removes a lot of warning noise and may help spot other warnings
like `ALSA lib ops.c:48:(lookup_ops) wrong kcontrol ops value string ''`
and others.
Now that commit 1b1ec6c492 ("topology/cmake: skip all topologies when
alsatplg < 1.2.5") enforces alsatplg version >= 1.2.5, it is finally safe
to do this!
I compared the generated .tplg files before/after this commit and
they're bit for bit identical. Tested with both alsatplg v2.6.1 from
Ubuntu 22 and version 1.2.9 from the SOF docker container.
Note this is a much smaller commit than the reverted
commit f50b6fe0ad ("topologies: switch all .m4 files to codec_provider
and codec_consumer") because most topologies v1 have been removed from
the main branch. Most topologies v1 are now only in stable-v2.2 where
the warning spam is still a problem :-(
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Set correct TDM slot width to 32 bits.
The error has been discovered after commit
0ba64e98ec ("SAI: use topology params").
We start using the tdm_slot_width from topology,
rather than hardcoded in code.
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
RTC_AEC module is using DP and rest of pipeline is LL and both can
run on different cores.
For the purpose to assign DP module individually on secondary core,
now add a new macro GOOGLE_AEC_DP_CORE_ID.
Signed-off-by: Yong Zhi <yong.zhi@intel.com>
This pipeline PCM -> ASRC -> DAI is used only in testbench test
topologies usage. None of the normal topologies build in SOF
use it. Since testbench can't support without failure the DAI
timestamps, the asynchronous mode is disabled. This allows
to test ASRC objective audio quality similarly as normal SRC.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Add cavs-mixin-mixin-mixout-eqiir-dts-ssp.conf to support EQ IIR + DTS
processing on rt5682
Co-developed-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Joe Cheng <joe.cheng@xperi.com>
In order to adopt more different playback pipelines, refer to
sof-hda-generic.conf and move playback pipeline in cavs-rt5682.conf to
cavs-mixin-mixout-ssp.conf.
Co-developed-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Joe Cheng <joe.cheng@xperi.com>
This commit adds DTS componenet and pipeline for topology2.
1. DTS component
2. A new pipeline to support EQ IIR + DTS processing
dts_spk.conf includes the parameters for DTS SDK V1.1.3
Co-developed-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Joe Cheng <joe.cheng@xperi.com>
In non sdw-dmic case, dai incremental id without it, so correct
HDMI1/2/3_ID sequence from default 5,6,7 to 4,5,6.
Signed-off-by: Mac Chiang <mac.chiang@intel.com>
This patch adds the aria test topologies build. Aria supports
only s32 format so the s16 and s24 versions build is left
out.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch adds test topologies build for gain component. Testing
of gain can be done with all supported s16/s24/s32 source and sink
formats. The topologies normally use only the s32 format
internally.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
The create of component benchmark topologies is moved to
other included file from CMakeLists.txt.
The adding of new components with custom parameters for
multiple formats and platforms is simplified with nested
foreach loops. The previous topologies for TGL are now
built also for MTL.
Due to use of "IN ZIP_LISTS" with foreach, cmake requirement
is bumped to 3.17 for topology2.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
The includes to define bytes and mixer controls classes are
needed in case no other class definition has included these.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch adds to benchmark topologies template .conf files
generator commented out control examples types for easier
ALSA controls create.
The controls include files are renamed since they may
contain all controls types and not just bytes.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Example: if a module has 2 input pins, one 16000/16/2, second 48000/16/2 and
one output pin 48000/32/4 and is designed to process 10ms data chunks:
in pin1 IBS should be 16(samples/1ms) * 2 bytes * 2 * 10(ms) = 640
in pin2 IBS should be 48(samples/1ms) * 2 bytes * 2 * 10(ms) = 1920
out pin1 OBS should be 48(samples/1ms) * 4 bytes * 4 * 10(ms) = 7680
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Yong Zhi <yong.zhi@intel.com>
This patch adds sof-mtl-rt722-l0.tplg, which is used
to support MTL RVP + RT722 EVB combination.
Headphone, speaker and DMIC functions are verified
with this topology.
Signed-off-by: Chao Song <chao.song@linux.intel.com>
This patch adds sof-lnl-rt711-l0-rt1316-l23-rt714-l1.tplg,
which is used to support LNL RVP + AIOC4.1 codec board
combination.
Signed-off-by: Chao Song <chao.song@linux.intel.com>
These topologies are no longer supported by mainline firmware code for
these platforms. The stable-v2.2 branch continues to support these
targets with topology1. Also SOF main branch provides topology2 targets
for a subset of these configurations.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This patch adds the class for the Time domain fixed beamformer
(TDFB) and example blobs for line arrays.
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch adds to definitions in common.conf a new class "text"
to support the enum control values.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Stop producing corrupted .tplg files when using `codec_consumer` (e.g.:
sof-imx8mp-btsco-dual-8ch.tplg, sof-imx8ulp-9x9-btsco-16k.tplg, ...)
Then we'll be able to finally search/replace "codec_master", see revert
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
We'll use this new function to require ALSA 1.2.5 and finally rename to
"codec_consumer" (see revert discussion #5192)
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
We want to fail if STATUS is not defined, the empty string, the FALSE
string or anything unexpected that it is not strictly equal to success
code "0".
Fixes commit 308a24a92b ("topology2: Add build support")
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Iuliana Prodan