diff options
| author | Anthony Koo <[email protected]> | 2018-04-05 19:20:15 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2018-08-27 16:10:53 +0000 |
| commit | be922ff750e40b292824959577aa914388ff6c8b (patch) | |
| tree | 5943bf3ab6c877938ce4c6f75c93c89e2f013e7e /drivers/gpu/drm/amd/display/modules/freesync/freesync.c | |
| parent | drm/amd/display: Fix bug that causes black screen (diff) | |
| download | kernel-be922ff750e40b292824959577aa914388ff6c8b.tar.gz kernel-be922ff750e40b292824959577aa914388ff6c8b.zip | |
drm/amd/display: Add back code to allow for rounding error
Signed-off-by: Anthony Koo <[email protected]>
Reviewed-by: Aric Cyr <[email protected]>
Acked-by: Harry Wentland <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/display/modules/freesync/freesync.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c index 4887c888bbe7..abd5c9374eb3 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c @@ -896,6 +896,17 @@ bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync, unsigned long long nominal_field_rate_in_uhz = mod_freesync_calc_nominal_field_rate(stream); + /* Allow for some rounding error of actual video timing by taking ceil. + * For example, 144 Hz mode timing may actually be 143.xxx Hz when + * calculated from pixel rate and vertical/horizontal totals, but + * this should be allowed instead of blocking FreeSync. + */ + nominal_field_rate_in_uhz = div_u64(nominal_field_rate_in_uhz, 1000000); + min_refresh_cap_in_uhz /= 1000000; + max_refresh_cap_in_uhz /= 1000000; + min_refresh_request_in_uhz /= 1000000; + max_refresh_request_in_uhz /= 1000000; + // Check nominal is within range if (nominal_field_rate_in_uhz > max_refresh_cap_in_uhz || nominal_field_rate_in_uhz < min_refresh_cap_in_uhz) @@ -921,7 +932,7 @@ bool mod_freesync_is_valid_range(struct mod_freesync *mod_freesync, // For variable range, check for at least 10 Hz range if ((max_refresh_request_in_uhz != min_refresh_request_in_uhz) && - (max_refresh_request_in_uhz - min_refresh_request_in_uhz < 10000000)) + (max_refresh_request_in_uhz - min_refresh_request_in_uhz < 10)) return false; return true; |