OSDN Git Service

drm/amd/display: prevent assert on error of 1 in calc_freesync_range
authorDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Fri, 5 May 2017 19:07:55 +0000 (15:07 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Sep 2017 22:07:01 +0000 (18:07 -0400)
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

index c5330f3..05a086c 100644 (file)
@@ -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;
        }