diff --git a/linux58-rc-tkg/PKGBUILD b/linux58-rc-tkg/PKGBUILD
index c4977d2..4e345ab 100644
--- a/linux58-rc-tkg/PKGBUILD
+++ b/linux58-rc-tkg/PKGBUILD
@@ -82,7 +82,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 _basekernel=5.8
-_sub=rc3
+_sub=rc4
 pkgver="${_basekernel}"."${_sub}"
 pkgrel=1
 pkgdesc='Linux-tkg'
@@ -119,18 +119,18 @@ source=("https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz"
         0011-ZFS-fix.patch
         #0012-linux-hardened.patch
 )
-sha256sums=('3b983f9c93c791424e4d0894031625d1d6b5ec04ec09a09de0248b374329ef05'
+sha256sums=('2b7ad65e1c7b55db6509dedcf33913499ff74747fdbe43b33da2c0f150f10b9a'
             '5ab29eb64e57df83b395a29a6a4f89030d142feffbfbf73b3afc6d97a2a7fd12'
             '6ee0c373c8aeed0f162f9515a3f82e14b90982bd3180e155cb91c1b6749e854a'
             '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
             '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
             'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
             'd02bf5ca08fd610394b9d3a0c3b176d74af206f897dee826e5cbaec97bb4a4aa'
-            'd74873190b973f35a3305924d91a851a6dcd1967e586579165e8af7068f27261'
+            'e36b6efad764eeede8cf90b4de6ef5f9241e8cf531530b33ee2e024e2961e9b5'
             '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
             '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33'
             '7fd8e776209dac98627453fda754bdf9aff4a09f27cb0b3766d7983612eb3c74'
-            'eb98cd685c5f4428fa4d8c2250807eac386af49b252c4bc325ccc7d8a7216468'
+            'de5140936bad5c6c31f7a1b7d20d3937353cf6e26d2d9bcbbe8930db8cbfc397'
             '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
             'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
             '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
diff --git a/linux58-rc-tkg/linux58-tkg-patches/0003-glitched-base.patch b/linux58-rc-tkg/linux58-tkg-patches/0003-glitched-base.patch
index 37dc411..9bdb32f 100644
--- a/linux58-rc-tkg/linux58-tkg-patches/0003-glitched-base.patch
+++ b/linux58-rc-tkg/linux58-tkg-patches/0003-glitched-base.patch
@@ -598,46 +598,3 @@ index d2fa3e9ccd97c..bd10cb02fc0ff 100644
  	if (!strcmp(str, "force"))
  		force_load = 1;
  	if (!strcmp(str, "hwp_only"))
-
-From 618c5a1236f179525d5f55beba23acf796581623 Mon Sep 17 00:00:00 2001
-From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-Date: Mon, 29 Jun 2020 13:03:52 -0400
-Subject: [PATCH] drm/amd/display: Only revalidate bandwidth on medium and fast
- updates
-
-[Why]
-Changes that are fast don't require updating DLG parameters making
-this call unnecessary. Considering this is an expensive call it should
-not be done on every flip.
-
-[How]
-Guard the validation to only happen if update type isn't FAST.
-
-Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
----
- drivers/gpu/drm/amd/display/dc/core/dc.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
-index 67402d75e67e..942ceb0f6383 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
-@@ -2607,10 +2607,12 @@ void dc_commit_updates_for_stream(struct dc *dc,
- 
- 	copy_stream_update_to_stream(dc, context, stream, stream_update);
- 
--	if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
--		DC_ERROR("Mode validation failed for stream update!\n");
--		dc_release_state(context);
--		return;
-+	if (update_type > UPDATE_TYPE_FAST) {
-+		if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
-+			DC_ERROR("Mode validation failed for stream update!\n");
-+			dc_release_state(context);
-+			return;
-+		}
- 	}
- 
- 	commit_planes_for_stream(
--- 
-2.25.1
diff --git a/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch b/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
index f634c60..4866ed4 100644
--- a/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
+++ b/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
@@ -6723,14 +6723,14 @@ index 000000000000..02d7d5a67c77
 +{
 +	struct mm_struct *mm = current->active_mm;
 +
-+	BUG_ON(cpu_online(smp_processor_id()));
++	BUG_ON(current != this_rq()->idle);
 +
 +	if (mm != &init_mm) {
 +		switch_mm(mm, &init_mm, current);
-+		current->active_mm = &init_mm;
 +		finish_arch_post_lock_switch();
 +	}
-+	mmdrop(mm);
++
++	/* finish_cpu(), as ran on the BP, will clean up the active_mm state */
 +}
 +
 +/*
@@ -8524,19 +8524,3 @@ index b5e3496cf803..0816db0b9c16 100644
  	};
  	struct wakeup_test_data *x = data;
  
-diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 244d305443773..90b77028233b0 100644
---- a/kernel/cpu.c
-+++ b/kernel/cpu.c
-@@ -1565,7 +1565,11 @@ static struct cpuhp_step cpuhp_hp_states[] = {
- 	[CPUHP_BRINGUP_CPU] = {
- 		.name			= "cpu:bringup",
- 		.startup.single		= bringup_cpu,
-+#ifdef CONFIG_SCHED_PDS
-+		.teardown.single	= NULL,
-+#else
- 		.teardown.single	= finish_cpu,
-+#endif
- 		.cant_stop		= true,
- 	},
- 	/* Final state before CPU kills itself */