Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora

3 files changed, 81 insertions, 6 deletions

diff --git a/kernel.spec b/kernel.spec
index d3a4da6c7..552553c5c 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2891,8 +2891,42 @@ fi
 #
 #
 %changelog
-* Wed Sep 15 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.17-200]
-- kernel-5.13.17-0 (Justin M. Forbes)
+* Thu Sep 16 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.18-200]
+- kernel-5.13.18-0 (Justin M. Forbes)
+
+* Wed Sep 15 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.17-0]
+- kernel-5.13.16-0 (Justin M. Forbes)
+- kernel-5.13.15-0 (Justin M. Forbes)
+- kernel-5.13.14-0 (Justin M. Forbes)
+- kernel-5.13.13-0 (Justin M. Forbes)
+- kernel-5.13.12-0 (Justin M. Forbes)
+- kernel-5.13.11-0 (Justin M. Forbes)
+- bpf: Fix integer overflow involving bucket_size (Tatsuhiko Yasumatsu)
+- kernel-5.13.10-0 (Justin M. Forbes)
+- Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes)
+- ASoC: Intel: sof_sdw_max98373: remove useless inits (Pierre-Louis Bossart)
+- ASoC: Intel: update sof_pcm512x quirks (Pierre-Louis Bossart)
+- ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant (jairaj arava)
+- ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart)
+- kernel-5.13.9-0 (Justin M. Forbes)
+- drm/i915/dp: Use max params for older panels (Kai-Heng Feng)
+- pinctrl: tigerlake: Fix GPIO mapping for newer version of software (Andy Shevchenko)
+- kernel-5.13.8-0 (Justin M. Forbes)
+- Re-enable sermouse for x86 (rhbz 1974002) (Justin M. Forbes)
+- Revert CRYPTO_ECDH and CRYPTO_ECDA from builtin to module to fix fips (Justin M. Forbes)
+- drm/rockchip: remove existing generic drivers to take over the device (Javier Martinez Canillas)
+- powerpc/pseries: Fix regression while building external modules (Srikar Dronamraju)
+- kernel-5.13.7-0 (Justin M. Forbes)
+- kernel-5.13.6-0 (Justin M. Forbes)
+- kernel-5.13.5-0 (Justin M. Forbes)
+- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes)
+- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes)
+- RHEL configs need this too (Justin M. Forbes)
+- kernel-5.13.4-0 (Justin M. Forbes)
+- Config update for 5.13.4 (Justin M. Forbes)
+- kernel-5.13.3-0 (Justin M. Forbes)
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang)
 
 * Mon Sep 13 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.16-0]
 - kernel-5.13.15-0 (Justin M. Forbes)
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch
index 722e6f963..d2fea8265 100644
--- a/patch-5.13-redhat.patch
+++ b/patch-5.13-redhat.patch
@@ -96,7 +96,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
 
  Boot into System Kernel
 diff --git a/Makefile b/Makefile
-index c79a2c70a22b..5e3e32edbd4b 100644
+index ddbd64b92a72..6e74913db692 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -508,6 +508,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
@@ -4590,3 +4590,44 @@ index 54d8d1ab577c..000000000000
 -/* different name and/or type of the variable doesn't matter */
 -char _license[] SEC("license") = "GPL";
 -int _version SEC("version") = 1;
+From 04fe164eacef2d9e6faac240e1c5537db88299ed Mon Sep 17 00:00:00 2001
+From: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
+Date: Thu, 1 Apr 2021 20:02:37 +0300
+Subject: [PATCH] drm/i915/display/psr: Disable DC3CO when the PSR2 is used
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Due to the changed sequence of activating/deactivating DC3CO, disable
+DC3CO until the changed dc3co activating/deactivating sequence is applied.
+
+References: https://gitlab.freedesktop.org/drm/intel/-/issues/3134
+Signed-off-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20210401170237.40472-1-gwan-gyeong.mun@intel.com
+---
+ drivers/gpu/drm/i915/display/intel_psr.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
+index 8ada4f829cab..4cec6b4d7fb9 100644
+--- a/drivers/gpu/drm/i915/display/intel_psr.c
++++ b/drivers/gpu/drm/i915/display/intel_psr.c
+@@ -654,6 +654,13 @@ tgl_dc3co_exitline_compute_config(struct intel_dp *intel_dp,
+ 	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+ 	u32 exit_scanlines;
+ 
++	/*
++	 * FIXME: Due to the changed sequence of activating/deactivating DC3CO,
++	 * disable DC3CO until the changed dc3co activating/deactivating sequence
++	 * is applied. B.Specs:49196
++	 */
++	return;
++
+ 	/*
+ 	 * DMC's DC3CO exit mechanism has an issue with Selective Fecth
+ 	 * TODO: when the issue is addressed, this restriction should be removed.
+-- 
+GitLab
+
diff --git a/sources b/sources
index e461cc495..d1b43f19f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13.17.tar.xz) = 29bca41aa55a210b33f1510a5c192f6df00debb2e087d859ce137aef4bbb121328a6017839384287c3ed23713b22de303b7eadaf0dd4f73fba9e14a27c1053f5
-SHA512 (kernel-abi-whitelists-5.13.17-200.tar.bz2) = e2ec29f2021eb4128f5456139b6a9b93d667a8137d7f92956dfd97976a41c46024eadc0ac001f146fc59e477ed7ddb637aa81a92ff3695a406dfefaef061dc46
-SHA512 (kernel-kabi-dw-5.13.17-200.tar.bz2) = 5de6959f753acbafe11a904e0c10cfa9b1ec790db640025d483acc205ca3421688a7df4bce332c7e6b74819e2ba042f995eb78ae3e8e81b9ecf0ede8bada3f5b
+SHA512 (linux-5.13.18.tar.xz) = 54a5a5e50889b6d27ddbc1a74228c9a00dacd0ec7ef9462cfbd3dc1bf6cf71c6f6ef80719fa7b7f13977ef067c9fa458d406d0580a588e8b71743bc8c3127624
+SHA512 (kernel-abi-whitelists-5.13.18-200.tar.bz2) = c0c3618f6472e7b8e1a18baa05779dc44a8267597277174afa1fdf31deaba5ad5d44e5bd0017af332d6c5603ceedbc0d6bcd9c602548fc6765fa8ad79fa643ea
+SHA512 (kernel-kabi-dw-5.13.18-200.tar.bz2) = 560b46b40db6bdcc8c16a78c435ce6de90373fa222f8f3e9534f0cadc0b1a7502f315277b99564101069d1e64e7fb6e0723dbbf5047db79c6872ef8da3afdec4