From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 1 Oct 2024 10:03:12 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v6.6.54~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e720db8b3fddd5cfd4daa92f0558d6a3bfd2b11b;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	drm-amd-display-round-calculated-vtotal.patch
---

diff --git a/queue-5.10/drm-amd-display-round-calculated-vtotal.patch b/queue-5.10/drm-amd-display-round-calculated-vtotal.patch
new file mode 100644
index 00000000000..63051d01ecb
--- /dev/null
+++ b/queue-5.10/drm-amd-display-round-calculated-vtotal.patch
@@ -0,0 +1,37 @@
+From c03fca619fc687338a3b6511fdbed94096abdf79 Mon Sep 17 00:00:00 2001
+From: Robin Chen <robin.chen@amd.com>
+Date: Fri, 23 Aug 2024 15:00:28 +0800
+Subject: drm/amd/display: Round calculated vtotal
+
+From: Robin Chen <robin.chen@amd.com>
+
+commit c03fca619fc687338a3b6511fdbed94096abdf79 upstream.
+
+[WHY]
+The calculated vtotal may has 1 line deviation. To get precisely
+vtotal number, round the vtotal result.
+
+Cc: Mario Limonciello <mario.limonciello@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Reviewed-by: Anthony Koo <anthony.koo@amd.com>
+Signed-off-by: Robin Chen <robin.chen@amd.com>
+Signed-off-by: Alex Hung <alex.hung@amd.com>
+Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/modules/freesync/freesync.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
++++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
+@@ -131,7 +131,7 @@ static unsigned int calc_v_total_from_re
+ 
+ 	v_total = div64_u64(div64_u64(((unsigned long long)(
+ 			frame_duration_in_ns) * (stream->timing.pix_clk_100hz / 10)),
+-			stream->timing.h_total), 1000000);
++			stream->timing.h_total) + 500000, 1000000);
+ 
+ 	/* v_total cannot be less than nominal */
+ 	if (v_total < stream->timing.v_total) {
diff --git a/queue-5.10/series b/queue-5.10/series
index f10174e3e03..1d0424cebbf 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -233,3 +233,4 @@ soc-versatile-integrator-fix-of-node-leak-in-probe-error-path.patch
 input-i8042-add-tuxedo-stellaris-16-gen5-amd-to-i8042-quirk-table.patch
 input-i8042-add-tuxedo-stellaris-15-slim-gen6-amd-to-i8042-quirk-table.patch
 input-i8042-add-another-board-name-for-tuxedo-stellaris-gen5-amd-line.patch
+drm-amd-display-round-calculated-vtotal.patch