Update to 5.12.4-3

5 files changed, 10 insertions, 131 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb45d6386dfd..125bedeece9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,8 +18,7 @@ pkgbase = linux-ck
 	source = more-uarches-20210412.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20210412.tar.gz
 	source = http://ck.kolivas.org/patches/5.0/5.12/5.12-ck1/patch-5.12-ck1.xz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-	source = 0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch
-	source = 0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch
+	source = 0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	b2sums = cb6413d9046bfbe68e7444aafd5353a3cf03a78aca38624dc91a313a8944c6da5d66f3fd7cc8dc47fc058287942d28c3e9d9eaa5da42a3a17d3d20e287968b03
@@ -27,9 +26,8 @@ pkgbase = linux-ck
 	b2sums = ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746
 	b2sums = 72194a32a06c43809d1272bd675890b6d27c6c54353150a366e8e2c50ad6eca6ee23c5d6281822965a228cfedfa07a60fe135d1b4f539e4a62728d4460cc0b0e
 	b2sums = c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3
-	b2sums = 213557da5172046b073aa4fe513f6bf50036bf462b08f6e26dc540ecc42d0caed531a23730e94a178526e8a6d501be6c7043aaf00a1cf293fa9ba7b47101b2e4
-	b2sums = b25bea0a96767e766dde01c9c8f1c50673a6dd9d57b3255f474b7c04bb638b9ca7e6cddcc8bb7cf7b0fe7f2cd4d2c454737750128e7284d97558c167ab46c710
-	b2sums = 17c8818b268fdbe798fe9594b39753a40e06d4f94932ec33a0ba8cbfd8414c6fa3342190ea00094dfdf3499215d811a98414150025ad8dd2a150d1bea81eadba
+	b2sums = 009468b6fb9c859b5cfff12af1fd0ff8be60362c161af2c24a0d1bda5a7827c770cac0e3a7faf985d59419f693fba181c846390a25c6f07c769a652bcaeeaa32
+	b2sums = c3a333eea69c74444d8dc0a10ba112fb7bb7faa173140df829cb27afbf5d97c7ade2ae9d88bbd315a51438ca01f88f1f9b06d4bf8a52a2e29c1f5fa9370773ca
 
 pkgname = linux-ck
 	pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 6c87bcbaa3b6..845e2e195840 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 6fe92facfd70f98899343cae2c4eacfe4225b387 Mon Sep 17 00:00:00 2001
+From ee5cf8733ed55ade590e32453b390090d40f7876 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
diff --git a/0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch b/0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch
index f3c7aa394c4e..fb7ab212fd7e 100644
--- a/0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch
+++ b/0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch
@@ -1,7 +1,7 @@
-From 676bfe06a676d970e6b8cc28b7cd18ac1db994c4 Mon Sep 17 00:00:00 2001
+From e3f30700184dbcf2378428ac3fac8a6fd889d8c2 Mon Sep 17 00:00:00 2001
 From: Steven Barrett <steven@liquorix.net>
 Date: Tue, 18 May 2021 11:35:29 -0500
-Subject: [PATCH 3/4] Revert "bus: mhi: core: Process execution environment
+Subject: [PATCH 2/3] Revert "bus: mhi: core: Process execution environment
  changes serially"
 
 Fix ath11k / QCA6390 initialization:
diff --git a/0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch b/0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch
deleted file mode 100644
index 891f8d50116e..000000000000
--- a/0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From a832c8fcc477b77ed614d7697ca05b50a910b4e2 Mon Sep 17 00:00:00 2001
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Date: Wed, 21 Apr 2021 13:20:31 +0800
-Subject: [PATCH 2/4] drm/i915/dp: Use slow and wide link training for
- everything
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Screen flickers on Innolux eDP 1.3 panel when clock rate 540000 is in use.
-
-According to the panel vendor, though clock rate 540000 is advertised,
-but the max clock rate it really supports is 270000.
-
-Ville Syrjälä mentioned that fast and narrow also breaks some eDP 1.4
-panel, so use slow and wide training for all panels to resolve the
-issue.
-
-User also confirmed that the new strategy doesn't introduce any
-regression on XPS 9380.
-
-v2:
- - Use slow and wide for everything.
-
-Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3384
-References: https://gitlab.freedesktop.org/drm/intel/-/issues/272
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20210421052054.1434718-1-kai.heng.feng@canonical.com
-(cherry picked from commit acca7762eb71bc05a8f28d29320d193150051f79)
-Fixes: 2bbd6dba84d4 ("drm/i915: Try to use fast+narrow link on eDP again and fall back to the old max strategy on failure")
-Cc: <stable@vger.kernel.org> # v5.12+
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
----
- drivers/gpu/drm/i915/display/intel_dp.c | 59 +++----------------------
- 1 file changed, 5 insertions(+), 54 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
-index 775d89b6c3fc..5a5103632564 100644
---- a/drivers/gpu/drm/i915/display/intel_dp.c
-+++ b/drivers/gpu/drm/i915/display/intel_dp.c
-@@ -1174,44 +1174,6 @@ intel_dp_compute_link_config_wide(struct intel_dp *intel_dp,
- 	return -EINVAL;
- }
- 
--/* Optimize link config in order: max bpp, min lanes, min clock */
--static int
--intel_dp_compute_link_config_fast(struct intel_dp *intel_dp,
--				  struct intel_crtc_state *pipe_config,
--				  const struct link_config_limits *limits)
--{
--	const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
--	int bpp, clock, lane_count;
--	int mode_rate, link_clock, link_avail;
--
--	for (bpp = limits->max_bpp; bpp >= limits->min_bpp; bpp -= 2 * 3) {
--		int output_bpp = intel_dp_output_bpp(pipe_config->output_format, bpp);
--
--		mode_rate = intel_dp_link_required(adjusted_mode->crtc_clock,
--						   output_bpp);
--
--		for (lane_count = limits->min_lane_count;
--		     lane_count <= limits->max_lane_count;
--		     lane_count <<= 1) {
--			for (clock = limits->min_clock; clock <= limits->max_clock; clock++) {
--				link_clock = intel_dp->common_rates[clock];
--				link_avail = intel_dp_max_data_rate(link_clock,
--								    lane_count);
--
--				if (mode_rate <= link_avail) {
--					pipe_config->lane_count = lane_count;
--					pipe_config->pipe_bpp = bpp;
--					pipe_config->port_clock = link_clock;
--
--					return 0;
--				}
--			}
--		}
--	}
--
--	return -EINVAL;
--}
--
- static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)
- {
- 	int i, num_bpc;
-@@ -1461,22 +1423,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
- 	    intel_dp_can_bigjoiner(intel_dp))
- 		pipe_config->bigjoiner = true;
- 
--	if (intel_dp_is_edp(intel_dp))
--		/*
--		 * Optimize for fast and narrow. eDP 1.3 section 3.3 and eDP 1.4
--		 * section A.1: "It is recommended that the minimum number of
--		 * lanes be used, using the minimum link rate allowed for that
--		 * lane configuration."
--		 *
--		 * Note that we fall back to the max clock and lane count for eDP
--		 * panels that fail with the fast optimal settings (see
--		 * intel_dp->use_max_params), in which case the fast vs. wide
--		 * choice doesn't matter.
--		 */
--		ret = intel_dp_compute_link_config_fast(intel_dp, pipe_config, &limits);
--	else
--		/* Optimize for slow and wide. */
--		ret = intel_dp_compute_link_config_wide(intel_dp, pipe_config, &limits);
-+	/*
-+	 * Optimize for slow and wide for everything, because there are some
-+	 * eDP 1.3 and 1.4 panels don't work well with fast and narrow.
-+	 */
-+	ret = intel_dp_compute_link_config_wide(intel_dp, pipe_config, &limits);
- 
- 	/* enable compression if the mode doesn't fit available BW */
- 	drm_dbg_kms(&i915->drm, "Force DSC en = %d\n", intel_dp->force_dsc_en);
--- 
-2.31.1
-
diff --git a/PKGBUILD b/PKGBUILD
index d9839d14ab03..f44176dacb64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -85,8 +85,7 @@ source=(
   "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
   "http://ck.kolivas.org/patches/5.0/5.12/5.12-ck${_ckpatchversion}/$_ckpatch.xz"
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch
-  0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch
+  0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -97,9 +96,8 @@ b2sums=('cb6413d9046bfbe68e7444aafd5353a3cf03a78aca38624dc91a313a8944c6da5d66f3f
         'ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746'
         '72194a32a06c43809d1272bd675890b6d27c6c54353150a366e8e2c50ad6eca6ee23c5d6281822965a228cfedfa07a60fe135d1b4f539e4a62728d4460cc0b0e'
         'c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3'
-        '213557da5172046b073aa4fe513f6bf50036bf462b08f6e26dc540ecc42d0caed531a23730e94a178526e8a6d501be6c7043aaf00a1cf293fa9ba7b47101b2e4'
-        'b25bea0a96767e766dde01c9c8f1c50673a6dd9d57b3255f474b7c04bb638b9ca7e6cddcc8bb7cf7b0fe7f2cd4d2c454737750128e7284d97558c167ab46c710'
-        '17c8818b268fdbe798fe9594b39753a40e06d4f94932ec33a0ba8cbfd8414c6fa3342190ea00094dfdf3499215d811a98414150025ad8dd2a150d1bea81eadba')
+        '009468b6fb9c859b5cfff12af1fd0ff8be60362c161af2c24a0d1bda5a7827c770cac0e3a7faf985d59419f693fba181c846390a25c6f07c769a652bcaeeaa32'
+        'c3a333eea69c74444d8dc0a10ba112fb7bb7faa173140df829cb27afbf5d97c7ade2ae9d88bbd315a51438ca01f88f1f9b06d4bf8a52a2e29c1f5fa9370773ca')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase