diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-01-30 03:20:56 -0500 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-01-30 03:21:30 -0500 |
| commit | 731323ae9197c8c4104bf4405e57d0f1278d56ee (patch) | |
| tree | 7d7a9d8250578b509d5f3bdb329d613fae5c8954 | |
| parent | f15fea450f793e794b69c9470e1dd0b4c87d62a9 (diff) | |
| download | kernel-731323ae9197c8c4104bf4405e57d0f1278d56ee.tar.gz kernel-731323ae9197c8c4104bf4405e57d0f1278d56ee.tar.xz kernel-731323ae9197c8c4104bf4405e57d0f1278d56ee.zip | |
Drop the last alsa 5.6 patch which applies but breaks the build
| -rw-r--r-- | alsa-5.6.patch | 46 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 0 insertions, 49 deletions
diff --git a/alsa-5.6.patch b/alsa-5.6.patch deleted file mode 100644 index 9336cffa2..000000000 --- a/alsa-5.6.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9aa9b367e35494f2d02112ca440a78908f645a04 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Fri, 22 Nov 2019 09:31:03 +0100 -Subject: [PATCH 4/4] ASoC: SOF - topology - do not change the link triger - order for old firmare - -This is patch for SOF v1.3 firmware. The DSP firmware will crash -without this patch. The 1.4.1 firmare has this issue fixed. - -BugLink: https://github.com/thesofproject/sof/issues/2102 -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - sound/soc/sof/topology.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c -index d82ab981e840..cbbbf96416ef 100644 ---- a/sound/soc/sof/topology.c -+++ b/sound/soc/sof/topology.c -@@ -2971,6 +2971,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, - struct snd_soc_tplg_private *private = &cfg->priv; - struct sof_ipc_dai_config config; - struct snd_soc_tplg_hw_config *hw_config; -+ struct sof_ipc_fw_version *v = &sdev->fw_ready.version; - int num_hw_configs; - int ret; - int i = 0; -@@ -2988,9 +2989,12 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, - if (!link->no_pcm) { - link->nonatomic = true; - -- /* set trigger order */ -- link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; -- link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; -+ /* this causes DSP panic on firmware v1.3 */ -+ if (SOF_ABI_VER(v->major, v->minor, v->micro) > SOF_ABI_VER(3, 7, 0)) { -+ /* set trigger order */ -+ link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; -+ link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; -+ } - - /* nothing more to do for FE dai links */ - return 0; --- -2.20.1 - diff --git a/kernel.spec b/kernel.spec index 608b39e17..b5d8cd351 100644 --- a/kernel.spec +++ b/kernel.spec @@ -855,9 +855,6 @@ Patch504: 0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch # https://lkml.org/lkml/2019/8/29/1772 Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch -# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support) -Patch527: alsa-5.6.patch - # GCC 10 build fix for x86_64 Patch528: 0001-x86-Don-t-declare-__force_order-in-kaslr_64.c.patch |