Updated

4 files changed, 7 insertions, 231 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46584121ade8..cdae3a92a866 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-amd-raven
-	pkgver = 5.4.v.70
+	pkgver = 5.4.v.71
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -12,18 +12,16 @@ pkgbase = linux-amd-raven
 	makedepends = git
 	makedepends = libelf
 	options = !strip
-	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v5.4.70
+	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v5.4.71
 	source = config.x86_64
 	source = linux-amd-raven.preset
 	source = linux.install
 	source = 5013_enable-cpu-optimizations-for-gcc10.patch
-	source = timerrework.patch
 	sha256sums = SKIP
-	sha256sums = b9f27be49c08b283d39e19d376a0833218b4d3679e1f37c1827b68b5949a1566
+	sha256sums = 9e279d136e56bba6d48e5d0165bd92740c1fea38775ef3d36aecc06cf12e2464
 	sha256sums = 0ac0cf410b0f3eeaa07d41505613e118ea59e01144e905f2dc0a808379f87e87
 	sha256sums = d590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0
 	sha256sums = 27b7fc535ade94b636c3ec4e809e141831e9465a0ef55215a9852b87048629e2
-	sha256sums = 44e739d674b0909d3dd1edb29ad9c4ab6543c32f488cbbcc30ba0fdc2bf902dc
 
 pkgname = linux-amd-raven
 	pkgdesc = Linux kernel with working amdgpu for Raven Ridge hardware
diff --git a/PKGBUILD b/PKGBUILD
index 3ca332e1e190..779e2cff1a8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=linux-amd-raven
 _srcname=linux
-gitver=v5.4.70
-pkgver=5.4.v.70
+gitver=v5.4.71
+pkgver=5.4.v.71
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -20,20 +20,16 @@ source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#ta
         'linux.install'
 	# patch from our gentoo overlords
 	'5013_enable-cpu-optimizations-for-gcc10.patch'
-	# i2c write rework patch
-	'timerrework.patch'
 )
 sha256sums=('SKIP'
             #config.x86_64
-            'b9f27be49c08b283d39e19d376a0833218b4d3679e1f37c1827b68b5949a1566'
+            '9e279d136e56bba6d48e5d0165bd92740c1fea38775ef3d36aecc06cf12e2464'
             #.preset file
             '0ac0cf410b0f3eeaa07d41505613e118ea59e01144e905f2dc0a808379f87e87'
             #linux install file
             'd590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0'
             #gentoopatch file
             '27b7fc535ade94b636c3ec4e809e141831e9465a0ef55215a9852b87048629e2'
-            #i2c write rework patchfile
-            '44e739d674b0909d3dd1edb29ad9c4ab6543c32f488cbbcc30ba0fdc2bf902dc'
 )
 
 _kernelname=${pkgbase#linux}
diff --git a/config.x86_64 b/config.x86_64
index 50fd6c7bd14e..9b7b395dabb5 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.70 Kernel Configuration
+# Linux/x86 5.4.71 Kernel Configuration
 #
 
 #
diff --git a/timerrework.patch b/timerrework.patch
deleted file mode 100644
index df6e083e2d99..000000000000
--- a/timerrework.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
-Reviewed-by: Hersen Wu <hersenxs.wu@xxxxxxx>
-Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
-Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
-Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
----
- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 67 ++++++++-----------
- 1 file changed, 29 insertions(+), 38 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
-index 70846ae7d854d..7fe6fbf41a7fa 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
-@@ -1771,8 +1771,7 @@ static void write_i2c_retimer_setting(
- 				slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 
- 			if (!i2c_success)
--				/* Write failure */
--				ASSERT(i2c_success);
-+				goto i2c_write_fail;
- 
- 			/* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A
- 			 * needs to be set to 1 on every 0xA-0xC write.
-@@ -1790,8 +1789,7 @@ static void write_i2c_retimer_setting(
- 						pipe_ctx->stream->link->ddc,
- 						slave_address, &offset, 1, &value, 1);
- 					if (!i2c_success)
--						/* Write failure */
--						ASSERT(i2c_success);
-+						goto i2c_write_fail;
- 				}
- 
- 				buffer[0] = offset;
-@@ -1803,8 +1801,7 @@ static void write_i2c_retimer_setting(
- 					offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 					slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 				if (!i2c_success)
--					/* Write failure */
--					ASSERT(i2c_success);
-+					goto i2c_write_fail;
- 			}
- 		}
- 	}
-@@ -1824,8 +1821,7 @@ static void write_i2c_retimer_setting(
- 					slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 
- 				if (!i2c_success)
--					/* Write failure */
--					ASSERT(i2c_success);
-+					goto i2c_write_fail;
- 
- 				/* Based on DP159 specs, APPLY_RX_TX_CHANGE bit in 0x0A
- 				 * needs to be set to 1 on every 0xA-0xC write.
-@@ -1843,8 +1839,7 @@ static void write_i2c_retimer_setting(
- 								pipe_ctx->stream->link->ddc,
- 								slave_address, &offset, 1, &value, 1);
- 						if (!i2c_success)
--							/* Write failure */
--							ASSERT(i2c_success);
-+							goto i2c_write_fail;
- 					}
- 
- 					buffer[0] = offset;
-@@ -1856,8 +1851,7 @@ static void write_i2c_retimer_setting(
- 						offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 						slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 					if (!i2c_success)
--						/* Write failure */
--						ASSERT(i2c_success);
-+						goto i2c_write_fail;
- 				}
- 			}
- 		}
-@@ -1875,8 +1869,7 @@ static void write_i2c_retimer_setting(
- 				offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 				slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 		if (!i2c_success)
--			/* Write failure */
--			ASSERT(i2c_success);
-+			goto i2c_write_fail;
- 
- 		/* Write offset 0x00 to 0x23 */
- 		buffer[0] = 0x00;
-@@ -1887,8 +1880,7 @@ static void write_i2c_retimer_setting(
- 			offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 			slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 		if (!i2c_success)
--			/* Write failure */
--			ASSERT(i2c_success);
-+			goto i2c_write_fail;
- 
- 		/* Write offset 0xff to 0x00 */
- 		buffer[0] = 0xff;
-@@ -1899,10 +1891,14 @@ static void write_i2c_retimer_setting(
- 			offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 			slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 		if (!i2c_success)
--			/* Write failure */
--			ASSERT(i2c_success);
-+			goto i2c_write_fail;
- 
- 	}
-+
-+	return;
-+
-+i2c_write_fail:
-+	DC_LOG_DEBUG("Set retimer failed");
- }
- 
- static void write_i2c_default_retimer_setting(
-@@ -1927,8 +1923,7 @@ static void write_i2c_default_retimer_setting(
- 		offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 		slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 	if (!i2c_success)
--		/* Write failure */
--		ASSERT(i2c_success);
-+		goto i2c_write_fail;
- 
- 	/* Write offset 0x0A to 0x17 */
- 	buffer[0] = 0x0A;
-@@ -1939,8 +1934,7 @@ static void write_i2c_default_retimer_setting(
- 		offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 		slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 	if (!i2c_success)
--		/* Write failure */
--		ASSERT(i2c_success);
-+		goto i2c_write_fail;
- 
- 	/* Write offset 0x0B to 0xDA or 0xD8 */
- 	buffer[0] = 0x0B;
-@@ -1951,8 +1945,7 @@ static void write_i2c_default_retimer_setting(
- 		offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 		slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 	if (!i2c_success)
--		/* Write failure */
--		ASSERT(i2c_success);
-+		goto i2c_write_fail;
- 
- 	/* Write offset 0x0A to 0x17 */
- 	buffer[0] = 0x0A;
-@@ -1963,8 +1956,7 @@ static void write_i2c_default_retimer_setting(
- 		offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n",
- 		slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 	if (!i2c_success)
--		/* Write failure */
--		ASSERT(i2c_success);
-+		goto i2c_write_fail;
- 
- 	/* Write offset 0x0C to 0x1D or 0x91 */
- 	buffer[0] = 0x0C;
-@@ -1975,8 +1967,7 @@ static void write_i2c_default_retimer_setting(
- 		offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 		slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 	if (!i2c_success)
--		/* Write failure */
--		ASSERT(i2c_success);
-+		goto i2c_write_fail;
- 
- 	/* Write offset 0x0A to 0x17 */
- 	buffer[0] = 0x0A;
-@@ -1987,8 +1978,7 @@ static void write_i2c_default_retimer_setting(
- 		offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 		slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 	if (!i2c_success)
--		/* Write failure */
--		ASSERT(i2c_success);
-+		goto i2c_write_fail;
- 
- 
- 	if (is_vga_mode) {
-@@ -2003,8 +1993,7 @@ static void write_i2c_default_retimer_setting(
- 			offset = 0x%x, reg_val = 0x%x, i2c_success = %d\n",
- 			slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 		if (!i2c_success)
--			/* Write failure */
--			ASSERT(i2c_success);
-+			goto i2c_write_fail;
- 
- 		/* Write offset 0x00 to 0x23 */
- 		buffer[0] = 0x00;
-@@ -2015,8 +2004,7 @@ static void write_i2c_default_retimer_setting(
- 			offset = 0x%x, reg_val= 0x%x, i2c_success = %d\n",
- 			slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 		if (!i2c_success)
--			/* Write failure */
--			ASSERT(i2c_success);
-+			goto i2c_write_fail;
- 
- 		/* Write offset 0xff to 0x00 */
- 		buffer[0] = 0xff;
-@@ -2027,9 +2015,13 @@ static void write_i2c_default_retimer_setting(
- 			offset = 0x%x, reg_val= 0x%x, i2c_success = %d end here\n",
- 			slave_address, buffer[0], buffer[1], i2c_success?1:0);
- 		if (!i2c_success)
--			/* Write failure */
--			ASSERT(i2c_success);
-+			goto i2c_write_fail;
- 	}
-+
-+	return;
-+
-+i2c_write_fail:
-+	DC_LOG_DEBUG("Set default retimer failed");
- }
- 
- static void write_i2c_redriver_setting(
-@@ -2058,8 +2050,7 @@ static void write_i2c_redriver_setting(
- 		slave_address, buffer[3], buffer[4], buffer[5], buffer[6], i2c_success?1:0);
- 
- 	if (!i2c_success)
--		/* Write failure */
--		ASSERT(i2c_success);
-+		DC_LOG_DEBUG("Set redriver failed");
- }
- 
- static void enable_link_hdmi(struct pipe_ctx *pipe_ctx)
--- 
-2.20.1