Commit Graph

283 Commits

Author SHA1 Message Date
Liam Girdwood 47339d2302
Merge pull request #22 from keqiaozhang/tplgfix
topology: fix id for sof_cnl_rt274 topology
2018-07-10 22:25:39 +01:00
Zhang Keqiao e55cd317a2 topology: fix id for sof_cnl_rt274 topology
Codec SSP id doesn't match with machine driver, so
change the id to 1 to fix the topology loading issue.

Signed-off-by: Zhang Keqiao <keqiao.zhang@linux.intel.com>
2018-07-10 10:47:14 +08:00
Liam Girdwood 764f9536cd
Merge pull request #20 from ranj063/topology/glk
topology: add multi-stream topology for GLK
2018-07-09 23:25:51 +01:00
Ranjani Sridharan 591a07d02d topology: add multi-stream topology for GLK
Add a multi-stream topology for GLK with speaker on SSP1, headset on
SSP2 and DMIC. Only playback pipelines on SSP1/2 for now. Capture
pipelines to be added later.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-07-07 23:08:50 -07:00
Liam Girdwood ff8eb10b18
Merge pull request #19 from xiulipan/tplgfix
topology fix for UP2
2018-07-06 11:54:20 +01:00
Pan Xiuli 794cf7a707 topology: fix id for sof_apl_pcm512x topology
SSP5 id should be kept to 0 and new added DMIC goes to 1 to keep old
machine driver work with both old topology and this topology.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-07-06 17:54:51 +08:00
Pan Xiuli dfe7fa9196 topology: test: set id to 0 for codec topology
For nocodec topology, we need the id to be same with SSP index since
all SSP ports are enabled in nocodec. Codec machine drivers always have
id to 0.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-07-06 17:54:51 +08:00
Liam Girdwood 600e2692bd
Merge pull request #18 from RanderWang/master
SOFT: fix this topology failed to be loaded
2018-07-04 13:20:15 +01:00
Rander Wang fa2e98a118 SOFT: fix this topology failed to be loaded
Set dai id number according to NoCodec-id

Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
2018-07-04 14:05:45 +08:00
Liam Girdwood 629d2a6bf1
Merge pull request #17 from singalsu/topic/fix_src_test_case_fail
SOFT: Improve audio test synchronization code
2018-07-02 10:33:14 +01:00
Seppo Ingalsuo 2cc0d1f9c6 SOFT: Improve audio test synchronization code
The audio tests signals contain a start and end marker to extract the
test output to analyze from in-between the markers.

This patch fixes a fail in SRC tests that was caused by incorrect
synchronization to output data. The chirp upper frequency is limited
to 0.99 x Nyquist frequency since the Nyquist frequency in the end
aliased and caused a visible artefact to spectral plot and it triggered
a resampler filter impulse response that had some correlation with
start/end marker chirps. The cosine chirp initialization to start from
90 degrees (zero PCM code instead of max.) also cleaned the start impulse
and improved the look of spectrogram plot.

The syncronization was limited to seek from one measured channel only. The
sync finder also didn't handle properly multi-channel input.

The output file start marker scan length was reduced to be
idle+marker length. And the scan time for end was reduced to be
2xidle+marker length

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-29 17:13:22 +03:00
Liam Girdwood 9aa6193795
Merge pull request #12 from zhigang-wu/master
ssp2 should be 8-channel
2018-06-29 14:29:52 +01:00
Liam Girdwood 2c786e9392
Merge pull request #16 from keyonjie/master
Revert "topology: dai: correct default_hw_conf_id"
2018-06-29 14:27:52 +01:00
Keyon Jie b5abe7194b topology: initial topology file for UP^2
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-29 18:38:12 +08:00
Keyon Jie 6da473ebab topology: sof-apl-nocodec: fix a comment typo
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-29 18:06:31 +08:00
Keyon Jie f359214717 Revert "topology: dai: correct default_hw_conf_id"
This reverts commit 229da95e0d which call
regression:
https://github.com/thesofproject/soft/issues/15

Default_hw_conf_id is id, not index of array, revert to fix it.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-29 15:47:28 +08:00
Wu Zhigang 707d6d6a5c topology: reorder the ssp setting by increasing order
reorder the ssp setting according on the ssp port number
from ssp0~ssp5. make it more clear.

Signed-off-by: Wu Zhigang <zhigang.wu@linux.intel.com>
2018-06-29 09:08:24 +08:00
Liam Girdwood 38399caeb5
Merge pull request #14 from singalsu/topic/fix_dmic_test_capture_topologies_v1
Topic/fix dmic test capture topologies v1
2018-06-28 14:06:59 +01:00
Seppo Ingalsuo 17f5a08d2e SOFT: Increase test capture pipeline max. channels count to 4
The 4ch DMIC capture test topologies can't work without this change to
pipeline.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-28 14:39:36 +03:00
Seppo Ingalsuo 3540310eea SOFT: Extend PCM parameters range in passtrough capture pipelines for DMIC
This patch extends the allowed sample rate range to 8 - 192 kHz, and
channels count to 1 - 16. Previously only 48 kHz and 2 - 4 channels was
allowed.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-28 13:26:11 +03:00
Wu Zhigang 254013aa94 topology: ssp2 should be 8 channels
this is typo error. ssp2 should be 8-channel

Signed-off-by: Wu Zhigang <zhigang.wu@linux.intel.com>
2018-06-28 14:13:39 +08:00
Liam Girdwood dfc0f67194
Merge pull request #10 from singalsu/topic/fix_src_playback_pipe_buffers_v1
SOFT: Increase SRC playback topology buffer size
2018-06-27 19:54:51 +01:00
Liam Girdwood 52b107e3c1
Merge pull request #8 from singalsu/topic/fix_src_tests_proposal_v1
SOFT: Fix the topology file name in SRC test topology lookup
2018-06-27 15:18:19 +01:00
Seppo Ingalsuo dc0d9e028e SOFT: Increase SRC playback topology buffer size
This patch increases the SRC source buffer to contain 5 periods of data
(measured for 1 ms @ 48 kHz ). It fixes the issue in 176.4 kHz to 48 kHz
playback conversion that the pipeline freezes with insufficient available
data in source buffer for SRC to convert and too little free in buffer
for host to fill another 48 frames.

176.4 kHz playback is currently the largest buffer size consumer due
to non-steady in/out rate. The higher rate conversion 192 kHz to 48 kHz
can operate with smaller size buffer due to steady in/out rate.

Note: This has been only simulated in the host test bench since SRC
playback does not run currently in real devices due to another issue.
However since buffers simulation is accurate this should be a real issue.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-27 16:44:43 +03:00
Seppo Ingalsuo 934a3300d6 SOFT: Fix the topology file name in SRC test topology lookup
The topology files naming has been updated to include mclk-N so it
needs to be added here as well for the script src_run.sh to work.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-27 15:43:00 +03:00
Liam Girdwood 905be3ac65
Merge pull request #7 from singalsu/topic/add_src_tests_proposal_v1
Topic/add src tests proposal v1
2018-06-27 13:09:29 +01:00
Seppo Ingalsuo 1abae16a11 SOFT: Add various utility scripts for audio component tests
This patch provides the non-standard based utilities to help to execute
the tests.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-27 13:50:49 +03:00
Seppo Ingalsuo a852b5341e SOFT: Add audio standards based objective performance measurements
This patch provides scripts to measure such performance as THD+N,
dynamic range, frequency response, gain, etc.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-27 13:49:33 +03:00
Seppo Ingalsuo aa3e72400c SOFT: Add SRC component test scripts
This patch provides tests for sample rate converter (SRC) SOF component.
The tests are executed via the SOF host (x86) version test executable and
the SRC component library.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-06-27 13:48:07 +03:00
Liam Girdwood f756455e90
Merge pull request #6 from ranj063/test_topology
Add more test topologies
2018-06-26 20:23:45 +01:00
Ranjani Sridharan ddbd2d655f topology: add more dmic test topologies
This patch modifies the test topology generator to add dmic topologies
with pre-defined PDM controller configurations, sample rates and
formats.

It also modifies the DMIC_CONFIG macro to get the number of
active pdm from the pdm config.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-26 11:42:27 -07:00
Ranjani Sridharan 82996c24a5 topology: add pre-defined PDM controller configs
Add some pre-defined PDM controller configs that sets the
number of active controllers and the corresponding
pdm tuples.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-26 11:41:23 -07:00
Ranjani Sridharan 71dff859e3 topology: add test topologies with mclk id 1
Add some test topologies with mclk id 1

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-26 11:18:09 -07:00
Liam Girdwood 75440af68a
Merge pull request #5 from keyonjie/master
multiple SSPs/BEs support for SOF--SOFT Part
2018-06-26 15:37:03 +01:00
Keyon Jie 9ac2e32099 topology: change BE name for NoCodec to support multiple SSPs/BEs
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-26 21:42:56 +08:00
Keyon Jie 553137d741 topology: sof-apl-nocodec: enable multiple SSP pipelines
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-26 21:37:27 +08:00
Keyon Jie 229da95e0d topology: dai: correct default_hw_conf_id
default_hw_conf_id was used by mistake, we should use index 0 of the hw
config array.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-06-26 21:29:39 +08:00
Liam Girdwood 308cf3d140
Merge pull request #4 from ranj063/dai_changes
DAI updates - topology changes
2018-06-26 12:19:29 +01:00
Liam Girdwood 7b96948052
Merge pull request #2 from xiulipan/master
rmbox: add missing trace class to sync with firmware
2018-06-26 12:15:30 +01:00
Liam Girdwood e393b33619
Merge pull request #1 from ranj063/topic/tone
Tone related changes in topology
2018-06-26 12:12:42 +01:00
Ranjani Sridharan f73aa73978 topology: move dmic related macros to dmic.m4 in platform/intel
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 13:44:52 -07:00
Ranjani Sridharan f58a047278 topology: move ssp related macros to ssp.m4 in platform/common
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 13:44:52 -07:00
Ranjani Sridharan a835ff2ae9 topology: move platform m4 files from dsps directory to platform/intel
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 13:44:52 -07:00
Ranjani Sridharan 1adb92ab2e topology: dai: rename sample_bits macro to config_data
Rename SAMPLE_BITS macro to a more generic CONFIG_DATA macro for SSP
to also include the mclk id.

Also modify users of the macro with the new name.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-25 13:44:38 -07:00
Ranjani Sridharan 6d9ad7a505 tokens: move SAMPLE_BITS to ssp tokens
SAMPLE_BITS is SSP specific. So move it to be part of the
ssp tokens.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-24 23:00:49 -07:00
Pan Xiuli 0beda35193 rmbox: add missing trace class to sync with firmware
Add missing trace class to the rmbox to avoid unknow value message.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-06-25 12:59:07 +08:00
Ranjani Sridharan e6140f8200 topology: add SAMPLE_RATE token for tone comp and define it in tone definition
Add SAMPLE_RATE token for tone comp.
Include it in tone definition and set it from the test pipeline definition.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-24 21:15:39 -07:00
Ranjani Sridharan c0172307ff topology: add new token for SSP MCLK ID
Some platforms might have more than one MCLK's exposed. Add a token
that will allow specifying the MCLK ID to be used in such cases.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-24 21:11:22 -07:00
Ranjani Sridharan 09148482f9 topology: add test tone pipelines for APL
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-24 00:29:05 -07:00
Ranjani Sridharan 41ef0529fc topology: use switch IO handler for tone switch
Use the bespoke switch IO handler in the driver for the tone switch kcontrol.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-06-24 00:28:55 -07:00