Repository navigation
Conversation
|
of course this set of patches conflict with my own changes... Will fix tomorrow. |
516105c to
e1bfb4d
Compare
|
SOFCI TEST |
|
Man, all platforms failed with this PR. That's quite a record. https://sof-ci.01.org/linuxpr/PR4632/build7049/devicetest/index.html Let's re-run to see what happened. |
|
SOFCI TEST |
|
Results are reproducible and really bad. @bardliao any idea what could cause this? |
|
@plbossart The issue is that
Can you try below change? diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 0bfff2ea111d..ce84d9c1d8be 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1054,6 +1054,9 @@ static int __soc_pcm_hw_params(struct snd_soc_pcm_runtime *rtd,
/* copy params for each cpu */
tmp_params = *params;
+ /* ch_map is only set in BE dai link */
+ if (rtd->dai_link->dynamic)
+ goto run;
/*
* construct cpu channel mask by combining ch_mask of each
* codec which maps to the cpu.
@@ -1075,7 +1078,7 @@ static int __soc_pcm_hw_params(struct snd_soc_pcm_runtime *rtd,
/* fixup cpu channel number */
if (ch_mask)
soc_pcm_codec_params_fixup(&tmp_params, ch_mask);
-
+run:
ret = snd_soc_dai_hw_params(cpu_dai, substream, &tmp_params);
if (ret < 0)
goto out;
|
|
still a really bad result for CML_SKU0955_HDA https://sof-ci.01.org/linuxpr/PR4632/build422/devicetest/index.html whaaat? |
7761c52 to
366b708
Compare
Current ASoC CPU:Codec = N:M connection is using connection mapping idea, but it is used for N < M case only. We want to use it for any case. By this patch, not only N:M connection, but all existing connection (1:1, 1:N, N:N) will use same connection mapping. Then, because it will use default mapping, no conversion patch is needed to exising drivers. More over, CPU:Codec = N:M (N > M) also supported in the same time. ch_maps array will has CPU/Codec index by this patch. Image CPU0 <---> Codec0 CPU1 <-+-> Codec1 CPU2 <-/ ch_map ch_map[0].cpu = 0 ch_map[0].codec = 0 ch_map[1].cpu = 1 ch_map[1].codec = 1 ch_map[2].cpu = 2 ch_map[2].codec = 1 Link: https://lore.kernel.org/r/87fs6wuszr.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/878r7yqeo4.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Now ASoC is supporting CPU:Codec = N:M support. This patch enables it on Audio Graph Card2. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Now ASoC is supporting CPU/Codec = N:M connection. This patch adds its sample settings. But One note here is that it has many type of samples, it reached to maximum of sound minor number. Therefore, new sample is disabled so far. If you want to try it, you need to disable some other one instead. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch adds ch-maps property to enable handling CPU:Codec = N:M connection. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
…ggregated dailink Use new 'ch_maps' and 'connected_node' introduced by Morimoto-san Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
use 'ch_maps' and 'connected_node' introduced by Morimoto-san Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Otherwise there's a kernel oops Suggested-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
…ggregated dailink Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This reverts commit f4ab7fa. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
366b708 to
7019e7e
Compare
|
testing v5 |
upstream patches from @morimoto (https://lore.kernel.org/alsa-devel/87mswp1ytu.wl-kuninori.morimoto.gx@renesas.com/)