aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0412-drm-amd-display-prevent-assert-on-error-of-1-in-calc.patch
blob: c6954850635d74b63cb880232ccdd09c8b52d233 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From 44b390f88666973b6443c07a0771564c4a30de9e Mon Sep 17 00:00:00 2001
From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Fri, 5 May 2017 15:07:55 -0400
Subject: [PATCH 0412/4131] drm/amd/display: prevent assert on error of 1 in
 calc_freesync_range

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
index c5330f3..05a086c 100644
--- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
+++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
@@ -422,12 +422,14 @@ static void calc_freesync_range(struct core_freesync *core_freesync,
 
 	/* In case of 4k free sync monitor, vmin or vmax cannot be less than vtotal */
 	if (state->freesync_range.vmin < vtotal) {
-		ASSERT(false);
+		/* Error of 1 is permissible */
+		ASSERT((state->freesync_range.vmin + 1) >= vtotal);
 		state->freesync_range.vmin = vtotal;
 	}
 
 	if (state->freesync_range.vmax < vtotal) {
-		ASSERT(false);
+		/* Error of 1 is permissible */
+		ASSERT((state->freesync_range.vmax + 1) >= vtotal);
 		state->freesync_range.vmax = vtotal;
 	}
 
-- 
2.7.4