diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-18 15:10:43 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-18 15:10:43 +0200 |
| commit | 4bcdc01631015f4d9a5d4a42f7ef74db99d04a82 (patch) | |
| tree | 3cfa973a020ff5f77f32204fb23b9afc002e7cf7 | |
| parent | cd6e874798736ee3518d5eca0cfac12106c82b22 (diff) | |
| parent | 7214da7cc53cb52db517c8023d3b155cd7adca05 (diff) | |
| download | kernel-4bcdc01631015f4d9a5d4a42f7ef74db99d04a82.tar.gz kernel-4bcdc01631015f4d9a5d4a42f7ef74db99d04a82.tar.xz kernel-4bcdc01631015f4d9a5d4a42f7ef74db99d04a82.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
| -rw-r--r-- | Patchlist.changelog | 3 | ||||
| -rwxr-xr-x | kernel.spec | 3 | ||||
| -rw-r--r-- | patch-5.14-redhat.patch | 52 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 60 insertions, 4 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index c29ea4c79..d63fe369a 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/7669a9b770057fa6a97e4fc23225e72ddba8719d + 7669a9b770057fa6a97e4fc23225e72ddba8719d ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 + https://gitlab.com/cki-project/kernel-ark/-/commit/32568097ff5803d25ac5e233583903c1c4666711 32568097ff5803d25ac5e233583903c1c4666711 e100e: Fix packet loss issues seen on Intel network controller diff --git a/kernel.spec b/kernel.spec index 617040a82..afc0375d2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2963,6 +2963,9 @@ fi # # %changelog +* Sun Oct 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.13-0] +- ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart) + * Wed Oct 13 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.12-0] - Linux v5.14.12 diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch index 9907a16ab..c9982dc31 100644 --- a/patch-5.14-redhat.patch +++ b/patch-5.14-redhat.patch @@ -42,6 +42,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + + sound/soc/intel/boards/sof_sdw.c | 12 + tools/testing/selftests/bpf/Makefile | 1 - .../selftests/bpf/prog_tests/linked_funcs.c | 42 -- .../testing/selftests/bpf/prog_tests/linked_maps.c | 30 -- @@ -55,7 +56,7 @@ tools/testing/selftests/bpf/progs/linked_maps2.c | 76 --- tools/testing/selftests/bpf/progs/linked_vars1.c | 54 -- tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- - 57 files changed, 709 insertions(+), 1510 deletions(-) + 58 files changed, 721 insertions(+), 1510 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2fb7012c3246..47718b4f2f75 100644 @@ -1810,6 +1811,29 @@ index 9ffa9e9c5c55..36484cc9842d 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { +diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c +index cb3afc4519cf..6a12f9817e0b 100644 +--- a/sound/soc/intel/boards/sof_sdw.c ++++ b/sound/soc/intel/boards/sof_sdw.c +@@ -128,6 +128,18 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { + SOF_RT711_JD_SRC_JD2 | + SOF_RT715_DAI_ID_FIX), + }, ++ { ++ /* Dell XPS 9710 */ ++ .callback = sof_sdw_quirk_cb, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5D") ++ }, ++ .driver_data = (void *)(SOF_SDW_TGL_HDMI | ++ RT711_JD2 | ++ SOF_RT715_DAI_ID_FIX | ++ SOF_SDW_FOUR_SPK), ++ }, + { + .callback = sof_sdw_quirk_cb, + .matches = { diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 93f1f124ef89..70905889a07b 100644 --- a/tools/testing/selftests/bpf/Makefile @@ -3198,3 +3222,29 @@ index e4f5bd388a3c..000000000000 -} - -char LICENSE[] SEC("license") = "GPL"; +From 53c4c6b56f335cb97de78ede2e2f65c5ff90df2c Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" <jforbes@fedoraproject.org> +Date: Tue, 10 Aug 2021 13:34:24 -0500 +Subject: [PATCH] Fix up backport of Dell XPS 9710 quirk + +Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> +--- + sound/soc/intel/boards/sof_sdw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c +index c78a98be343d..3635d8002ecf 100644 +--- a/sound/soc/intel/boards/sof_sdw.c ++++ b/sound/soc/intel/boards/sof_sdw.c +@@ -136,7 +136,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5D") + }, + .driver_data = (void *)(SOF_SDW_TGL_HDMI | +- RT711_JD2 | ++ SOF_RT711_JD_SRC_JD2 | + SOF_RT715_DAI_ID_FIX | + SOF_SDW_FOUR_SPK), + }, +-- +2.31.1 + @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.19-200.tar.bz2) = 7d28816c431019c9f09b7bcda4eb43ed2c3a7cbb8199af0fecccf16bff3ac992e2c9ed3acc2d06d7c8ebec3dc9ad76d0975cc179d2e4b7541af2af05f7e35de6 -SHA512 (linux-5.14.12.tar.xz) = a23f1d652533bf047215375a94f6562d46289dd744bcd9241a66edd69f999931ce71356f61601f30a6da2edc4e1a6defd90d5f3dc5f3382fbb4141f25448397f -SHA512 (kernel-abi-stablelists-5.14.12-200.tar.bz2) = 2cd10d833c39defdfb11316c0d69720ebf1dc8ae5e07fd7eb7498a9c6cdec9989cfddd61ceb5bc415baffccd52166c45ba3d65cb5a67b3a5f29e886c23e4e040 -SHA512 (kernel-kabi-dw-5.14.12-200.tar.bz2) = 6329bb435b8572caba50cb4a5b8fc435637ef1eff69bdac8e99b4cc7e1cc6f46d5da48fa1282ee43118db4d0c3372dd738787acf690496ccb7a4f5058755e6ce +SHA512 (linux-5.14.13.tar.xz) = 94bf4282b863439b1ec4a900e404142abc08b1b8085356b74352b09ab7ddd708f357b3d3c3f29d9ff3fbe7d4fb6529d699d84ff1e8b43df09b8f643b058c7d51 +SHA512 (kernel-abi-stablelists-5.14.13-200.tar.bz2) = 2f0f6fbe1df337c1dfba4905977e44eefb04e3b53e0820c3a72f92c9c3a2fb1344ddcef171217977dafacafc66f6098ce320b1e999d0994b5a5db9c836964bae +SHA512 (kernel-kabi-dw-5.14.13-200.tar.bz2) = e18e0183c6ea2a8bf968721d22cf609cfbdb47e4a026355aa4ad5c1902debe4d23a1da1684984589a31dda28d96f890a50f1d8c1e772f263e5023faa5a821bed |