Updated to 5.12.7

3 files changed, 12 insertions, 129 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e675568..d575b64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ _custom=1
 pkgbase=linux-ck
 _supver=5
 _majver=12
-_minver=4
+_minver=7
 _gccpatchver='20210412'
 _gccpatchger='10'
 _gccpatchker='5.8'
@@ -33,7 +33,7 @@ _ckpatchversion=ck1
   else
     pkgver=${_supver}.${_majver}.${_minver}
   fi
-pkgrel=1
+pkgrel=1.2
 pkgdesc='Linux-ck'
 url='https://kernel.org'
 #url='http://ck.kolivas.org/patches/'
@@ -51,7 +51,6 @@ source=(
   config         # the main kernel config file
   linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/patch-${_supver}.${_majver}-${_ckpatchversion}.xz
   ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  drm-i915-dp-Use-slow-and-wide-link-training-for-everything.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
   raid6-default-algo.patch
@@ -61,12 +60,11 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-b2sums=('cb6413d9046bfbe68e7444aafd5353a3cf03a78aca38624dc91a313a8944c6da5d66f3fd7cc8dc47fc058287942d28c3e9d9eaa5da42a3a17d3d20e287968b03'
+b2sums=('7881dceb8a88dfc290ef8e175e31f6b7cba30c1b343883344915acda6b9b20484496511f1d2d9a7e8195621db3b4c93fdc16c1d5be5cb9b685d1d8940800ab58'
         'SKIP'
-        '1dcdae744c69a4118bb0434a31dfa98c6a77be6e422a52822c936c93bf32cf593724f517e4bd183fd194c3456795e001ce336dea463148bb875656d60e39142e'
+        'a40ce1491df4f8fdc7c1ed9bd3937b9b350c34f0c4704150368026f26a5a73c8ec9ddcf7b0070243596278e7262958e0f9f2ab080ca7a3e243a07bf9664e94a4'
         'c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3'
         '2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f'
-        'af00ac636a9107252e3be195d61862287e3fbe75c495b2ee625d2063f8a4f06fa53cec891038ec1b3be0b95e6b104801dde1038f5bd4cc6cddc247a219b5a38c'
         '72194a32a06c43809d1272bd675890b6d27c6c54353150a366e8e2c50ad6eca6ee23c5d6281822965a228cfedfa07a60fe135d1b4f539e4a62728d4460cc0b0e'
         'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a')
@@ -88,7 +86,6 @@ prepare() {
   # Hotfixes
   echo "Applying hotfixes"
   patch -p1 -i ../ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  patch -p1 -i ../drm-i915-dp-Use-slow-and-wide-link-training-for-everything.patch
 
 
   # ck patch
diff --git a/config b/config
index b4a3f21..1d983b4 100644
--- a/config
+++ b/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.12.2 Kernel Configuration
+# Linux/x86 5.12.7 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100200
+CONFIG_GCC_VERSION=110100
 CONFIG_CLANG_VERSION=0
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=23601
@@ -12,6 +12,7 @@ CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -2319,7 +2320,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_RAM=m
-# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
 # end of RAM/ROM/Flash chip drivers
 
@@ -8459,7 +8460,6 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD7949=m
 CONFIG_AD799X=m
-# CONFIG_AD9467 is not set
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
@@ -10006,6 +10006,8 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_ARCH_KCSAN=y
+CONFIG_HAVE_KCSAN_COMPILER=y
+# CONFIG_KCSAN is not set
 # end of Generic Kernel Debugging Instruments
 
 CONFIG_DEBUG_KERNEL=y
@@ -10049,7 +10051,7 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_HAVE_ARCH_KFENCE=y
 CONFIG_KFENCE=y
 CONFIG_KFENCE_STATIC_KEYS=y
-CONFIG_KFENCE_SAMPLE_INTERVAL=100
+CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_STRESS_TEST_FAULTS=0
 # end of Memory Debugging
diff --git a/drm-i915-dp-Use-slow-and-wide-link-training-for-everything.patch b/drm-i915-dp-Use-slow-and-wide-link-training-for-everything.patch
deleted file mode 100644
index 61a6117..0000000
--- a/drm-i915-dp-Use-slow-and-wide-link-training-for-everything.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From d290a24cb45e73e4f8d2700d5f47c2132d066fe2 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: 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);
--- 
-cgit v1.2.3-1-gf6bb5
-