From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Fri, 5 May 2017 15:07:55 -0400
Subject: drm/amd/display: prevent assert on error of 1 in calc_freesync_range
Git-commit: ac5c294719909bd5d2d3f8c74f894bdda5744916
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

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>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/modules/freesync/freesync.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- 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 c
 
 	/* 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;
 	}