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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
From 13b90c08f783ed42c761174a375908d6f2c715e5 Mon Sep 17 00:00:00 2001
From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Wed, 30 May 2018 17:17:27 -0400
Subject: [PATCH 4776/5725] drm/amd/display: change dentist DID enum values to
uppercase
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 50 ++++++++++++-------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index 0a4ae0f..6882dc9 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -103,39 +103,39 @@ static const struct state_dependent_clocks dce120_max_clks_by_state[] = {
/* Starting DID for each range */
enum dentist_base_divider_id {
- dentist_base_divider_id_1 = 0x08,
- dentist_base_divider_id_2 = 0x40,
- dentist_base_divider_id_3 = 0x60,
- dentist_max_divider_id = 0x80
+ DENTIST_BASE_DID_1 = 0x08,
+ DENTIST_BASE_DID_2 = 0x40,
+ DENTIST_BASE_DID_3 = 0x60,
+ DENTIST_MAX_DID = 0x80
};
/* Starting point and step size for each divider range.*/
enum dentist_divider_range {
- dentist_divider_range_1_start = 8, /* 2.00 */
- dentist_divider_range_1_step = 1, /* 0.25 */
- dentist_divider_range_2_start = 64, /* 16.00 */
- dentist_divider_range_2_step = 2, /* 0.50 */
- dentist_divider_range_3_start = 128, /* 32.00 */
- dentist_divider_range_3_step = 4, /* 1.00 */
- dentist_divider_range_scale_factor = 4
+ DENTIST_DIVIDER_RANGE_1_START = 8, /* 2.00 */
+ DENTIST_DIVIDER_RANGE_1_STEP = 1, /* 0.25 */
+ DENTIST_DIVIDER_RANGE_2_START = 64, /* 16.00 */
+ DENTIST_DIVIDER_RANGE_2_STEP = 2, /* 0.50 */
+ DENTIST_DIVIDER_RANGE_3_START = 128, /* 32.00 */
+ DENTIST_DIVIDER_RANGE_3_STEP = 4, /* 1.00 */
+ DENTIST_DIVIDER_RANGE_SCALE_FACTOR = 4
};
static int dentist_get_divider_from_did(int did)
{
- if (did < dentist_base_divider_id_1)
- did = dentist_base_divider_id_1;
- if (did > dentist_max_divider_id)
- did = dentist_max_divider_id;
-
- if (did < dentist_base_divider_id_2) {
- return dentist_divider_range_1_start + dentist_divider_range_1_step
- * (did - dentist_base_divider_id_1);
- } else if (did < dentist_base_divider_id_3) {
- return dentist_divider_range_2_start + dentist_divider_range_2_step
- * (did - dentist_base_divider_id_2);
+ if (did < DENTIST_BASE_DID_1)
+ did = DENTIST_BASE_DID_1;
+ if (did > DENTIST_MAX_DID)
+ did = DENTIST_MAX_DID;
+
+ if (did < DENTIST_BASE_DID_2) {
+ return DENTIST_DIVIDER_RANGE_1_START + DENTIST_DIVIDER_RANGE_1_STEP
+ * (did - DENTIST_BASE_DID_1);
+ } else if (did < DENTIST_BASE_DID_3) {
+ return DENTIST_DIVIDER_RANGE_2_START + DENTIST_DIVIDER_RANGE_2_STEP
+ * (did - DENTIST_BASE_DID_2);
} else {
- return dentist_divider_range_3_start + dentist_divider_range_3_step
- * (did - dentist_base_divider_id_3);
+ return DENTIST_DIVIDER_RANGE_3_START + DENTIST_DIVIDER_RANGE_3_STEP
+ * (did - DENTIST_BASE_DID_3);
}
}
@@ -186,7 +186,7 @@ static int dce_get_dp_ref_freq_khz(struct dccg *clk)
target_div = dentist_get_divider_from_did(dprefclk_wdivider);
/* Calculate the current DFS clock, in kHz.*/
- dp_ref_clk_khz = (dentist_divider_range_scale_factor
+ dp_ref_clk_khz = (DENTIST_DIVIDER_RANGE_SCALE_FACTOR
* clk_dce->dentist_vco_freq_khz) / target_div;
return dccg_adjust_dp_ref_freq_for_ss(clk_dce, dp_ref_clk_khz);
--
2.7.4
|
