diff --git a/PKGBUILD b/PKGBUILD
index ac5b3f3..5957951 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -102,7 +102,7 @@ case $_basever in
         	0012-linux-hardened.patch
 	)
 	sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
-            'a990d5aca3f8971d3cbd1938a80be9b24a885b3ad13028298efb57451cc9d413'
+            '550840075be45fab1844e7f799922ca4b83ddedad66f41b97a7d77997ec9a86b'
             #'SKIP'
             '83d7d518dc9592ffcd79511163c49e50b767f539bc552b636810a8ca67ddca7d'
             '1f4a20d6eaaa0d969af93152a65191492400c6aa838fc1c290b0dd29bb6019d8'
@@ -318,7 +318,7 @@ case $_basever in
         0012-misc-additions.patch
     )
     sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
-            'cf1da5dd2bff7c06735cce261b792151bca9f866bea6bae71ddafaee950a834a'
+            'c094adedd2ff813c3015122bb4ea8ab3f2dd1a4288c2d06e7ad1a922f77c4f33'
             'SKIP'
             'e78e683b9a8c15003d91f810cfe576c6266f330f3b8fe13eb52226c50070e87f'
             'eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341'
@@ -451,7 +451,7 @@ case $_basever in
         0002-mm-Support-soft-dirty-flag-read-with-reset.patch
     )
     sha256sums=('7d0df6f2bf2384d68d0bd8e1fe3e071d64364dcdc6002e7b5c87c92d48fac366'
-            '84a39f8cbcca15af34bf431d6eb14d241bb4d1f0455da96ee0cbe1a22d44a39d'
+            '8e192e06d4e4fd28f54f270e70602d95332e43864f7d4a3e0ecf4255ac0c2e6d'
             'SKIP'
             'a0c09bee4da5acbfed5565f96bc2df354467035171cf493e165ba79bb6af04ee'
             '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
@@ -473,7 +473,7 @@ case $_basever in
             '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
             'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
             '6325b3d6972725e41adbaf5e2db19a040dbf0856046cecc1c4d6786a064d04ff'
-            'f080c23c3888ab1d952863417f5697d7dd3ab29e274a5df8ec75aaa20b228744'
+            '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24'
             'b1c6599d0e1ac9b66898d652ed99dae3fb8676d840a43ffa920a78d96e0521be'
             'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')
 	;;
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 89fe715..ed236ca 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -5,13 +5,13 @@ _supported_kernels=("5.13" "5.12" "5.11" "5.10" "5.9" "5.8" "5.7" "5.4")
 
 typeset -A _kver_subver_map
 _kver_subver_map=(
-  ["5.4"]="128"
+  ["5.4"]="129"
   ["5.7"]="19"
   ["5.8"]="18"
   ["5.9"]="16"
-  ["5.10"]="46"
+  ["5.10"]="47"
   ["5.11"]="22"
-  ["5.12"]="13"
+  ["5.12"]="14"
   ["5.13"]="0"
 )
 
diff --git a/linux-tkg-patches/5.12/0012-misc-additions.patch b/linux-tkg-patches/5.12/0012-misc-additions.patch
index 68a2659..2e058a6 100644
--- a/linux-tkg-patches/5.12/0012-misc-additions.patch
+++ b/linux-tkg-patches/5.12/0012-misc-additions.patch
@@ -131,57 +131,3 @@ index 2c7171e0b0010..85de313ddec29 100644
  	select CPU_FREQ_GOV_CONSERVATIVE
  	select CPU_FREQ_GOV_PERFORMANCE
  	help
-Revert "drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue."
-Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell."
-
-This revert commits:
-a3b4cfb09aa9e73cc48caff77efc161a396aeddb.
-feae47198886d0df7b43876916a0e4366f159b45
-
-Reason for revert: side effect of enlarging CP_MEC_DOORBELL_RANGE may
-cause some APUs fail to enter gfxoff in certain user cases.
-
-Signed-off-by: Yifan Zhang <yifan1.zhang at amd.com>
----
- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +-----
- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c  | 6 +-----
- 2 files changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
-index 7bfe6f9d3a52..15ae9e33b925 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
-@@ -6974,12 +6974,8 @@ static int gfx_v10_0_kiq_init_register(struct amdgpu_ring *ring)
- 	if (ring->use_doorbell) {
- 		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
- 			(adev->doorbell_index.kiq * 2) << 2);
--		/* If GC has entered CGPG, ringing doorbell > first page doesn't
--		 * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround
--		 * this issue.
--		 */
- 		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
--			(adev->doorbell.size - 4));
-+			(adev->doorbell_index.userqueue_end * 2) << 2);
- 	}
- 
- 	WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-index 922420a2c102..044076ec1d03 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-@@ -3675,12 +3675,8 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring)
- 	if (ring->use_doorbell) {
- 		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
- 					(adev->doorbell_index.kiq * 2) << 2);
--		/* If GC has entered CGPG, ringing doorbell > first page doesn't
--		 * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround
--		 * this issue.
--		 */
- 		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
--					(adev->doorbell.size - 4));
-+					(adev->doorbell_index.userqueue_end * 2) << 2);
- 	}
- 
- 	WREG32_SOC15_RLC(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
--- 
-2.25.1