blob: be59ccbe1e82fb4f670649f4f970fbe0ba074ae8 (
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
39
40
41
42
43
44
45
46
47
48
49
50
|
From ba21331eb4da80b585467890ce91b22a9cafd161 Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Tue, 14 Feb 2017 14:51:06 -0500
Subject: [PATCH 0218/4131] drm/amd/display: Fix 64-bit division, yet again
Also make the code somewhat more readable.
Signed-off-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 | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
index b00b1df..2026ef3 100644
--- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
+++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c
@@ -210,6 +210,8 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync,
struct core_freesync *core_freesync = NULL;
int persistent_freesync_enable = 0;
struct persistent_data_flag flag;
+ unsigned int nom_refresh_rate_micro_hz;
+ unsigned long long temp;
if (mod_freesync == NULL)
return false;
@@ -262,11 +264,16 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync,
enable_for_video = false;
}
- unsigned int nom_refresh_rate_micro_hz = (unsigned int)
- (((unsigned long long) core_stream->public.timing.pix_clk_khz) * 1000ULL * 1000ULL * 1000ULL
- / core_stream->public.timing.h_total / core_stream->public.timing.v_total);
+ temp = core_stream->public.timing.pix_clk_khz;
+ temp *= 1000ULL * 1000ULL * 1000ULL;
+ temp = div_u64(temp, core_stream->public.timing.h_total);
+ temp = div_u64(temp, core_stream->public.timing.v_total);
- if (caps->supported && nom_refresh_rate_micro_hz >= caps->min_refresh_in_micro_hz && nom_refresh_rate_micro_hz <= caps->max_refresh_in_micro_hz)
+ nom_refresh_rate_micro_hz = (unsigned int) temp;
+
+ if (caps->supported &&
+ nom_refresh_rate_micro_hz >= caps->min_refresh_in_micro_hz &&
+ nom_refresh_rate_micro_hz <= caps->max_refresh_in_micro_hz)
core_stream->public.ignore_msa_timing_param = 1;
core_freesync->num_entities++;
--
2.7.4
|
