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
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
From dd1a23600368f1ff6c678a759be37050129a038f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Sep 2017 10:10:22 +1000
Subject: [PATCH 2680/4131] drm/amd/display: drop display_pipe_clocks.c.
This code isn't used at all in the kernel tree, perhaps it can wait to
be imported when it is. It also does a lot of floating point calcs,
so probably good to drop it until it's needed and we can ensure
proper fpu accessors.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +-
.../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 -
.../drm/amd/display/dc/dml/display_pipe_clocks.c | 106 ---------------------
.../drm/amd/display/dc/dml/display_pipe_clocks.h | 37 -------
4 files changed, 1 insertion(+), 145 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.c
delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.h
diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile
index c6d9d95..87bab8e 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
@@ -13,7 +13,7 @@ CFLAGS_soc_bounding_box.o := -mhard-float -msse -mpreferred-stack-boundary=4
CFLAGS_dml_common_defs.o := -mhard-float -msse -mpreferred-stack-boundary=4
-DML = display_mode_lib.o display_pipe_clocks.o display_rq_dlg_calc.o \
+DML = display_mode_lib.o display_rq_dlg_calc.o \
display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \
soc_bounding_box.o dml_common_defs.o display_mode_vba.o
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
index 11c89c5..26f4f2a 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
@@ -29,7 +29,6 @@
#include "dml_common_defs.h"
#include "soc_bounding_box.h"
#include "display_mode_vba.h"
-#include "display_pipe_clocks.h"
#include "display_rq_dlg_calc.h"
#include "dml1_display_rq_dlg_calc.h"
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.c b/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.c
deleted file mode 100644
index 30c379d..0000000
--- a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2017 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#include "display_pipe_clocks.h"
-#include "display_mode_lib.h"
-#include "soc_bounding_box.h"
-
-display_pipe_clock_st dml_clks_get_pipe_clocks(
- struct display_mode_lib *mode_lib,
- display_e2e_pipe_params_st *e2e,
- unsigned int num_pipes)
-{
- display_pipe_clock_st clocks;
- bool visited[DC__NUM_PIPES__MAX];
- double max_dispclk = 25.0; //the min dispclk is 25MHz, so keep the min dispclk caculated larger thant 25MHz
- double dcfclk, socclk;
- unsigned int i, j, k;
- unsigned int dsc_inst = 0;
-
- DTRACE("Calculating pipe clocks...");
-
- dcfclk = dml_socbb_voltage_scaling(
- &mode_lib->soc,
- (enum voltage_state) e2e[0].clks_cfg.voltage).dcfclk_mhz;
- socclk = dml_socbb_voltage_scaling(
- &mode_lib->soc,
- (enum voltage_state) e2e[0].clks_cfg.voltage).socclk_mhz;
- clocks.dcfclk_mhz = dcfclk;
- clocks.socclk_mhz = socclk;
-
- max_dispclk = dml_max(max_dispclk, get_dispclk_calculated(mode_lib, e2e, num_pipes));
- clocks.dispclk_mhz = max_dispclk;
- DTRACE(" dispclk: %f Mhz", clocks.dispclk_mhz);
- DTRACE(" dcfclk: %f Mhz", clocks.dcfclk_mhz);
- DTRACE(" socclk: %f Mhz", clocks.socclk_mhz);
-
- for (k = 0; k < num_pipes; ++k)
- visited[k] = false;
-
- for (i = 0; i < num_pipes; i++) {
- clocks.dppclk_mhz[i] = get_dppclk_calculated(mode_lib, e2e, num_pipes, i);
- DTRACE(" dppclk%d: %f Mhz", i, clocks.dppclk_mhz[i]);
-
- if (e2e[i].pipe.src.is_hsplit && !visited[i]) {
- unsigned int grp = e2e[i].pipe.src.hsplit_grp;
-
- for (j = i; j < num_pipes; j++) {
- if (e2e[j].pipe.src.hsplit_grp == grp && e2e[j].pipe.src.is_hsplit
- && !visited[j]) {
- clocks.dscclk_mhz[j] = get_dscclk_calculated(
- mode_lib,
- e2e,
- num_pipes,
- dsc_inst);
- DTRACE(" dscclk%d: %f Mhz", j, clocks.dscclk_mhz[j]);
- visited[j] = true;
- }
- }
- dsc_inst++;
- }
-
- if (!visited[i]) {
- unsigned int otg_inst = e2e[i].pipe.dest.otg_inst;
-
- for (j = i; j < num_pipes; j++) {
- // assign dscclk to all planes with this otg, except if they're doing odm combine, or mpc combine
- // which is handled by the conditions above, the odm_combine is not required, but it helps make sense of this code
- if (e2e[j].pipe.dest.otg_inst == otg_inst
- && !e2e[j].pipe.dest.odm_combine && !visited[j]) {
- clocks.dscclk_mhz[j] = get_dscclk_calculated(
- mode_lib,
- e2e,
- num_pipes,
- dsc_inst);
- DTRACE(" dscclk%d: %f Mhz", j, clocks.dscclk_mhz[j]);
- visited[j] = true;
- }
- }
- dsc_inst++;
- }
- }
-
- return clocks;
-}
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.h b/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.h
deleted file mode 100644
index a712dc3..0000000
--- a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2017 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-#ifndef __DISPLAY_PIPE_CLOCKS_H__
-#define __DISPLAY_PIPE_CLOCKS_H__
-
-#include "dml_common_defs.h"
-
-struct display_mode_lib;
-
-display_pipe_clock_st dml_clks_get_pipe_clocks(
- struct display_mode_lib *mode_lib,
- display_e2e_pipe_params_st *e2e,
- unsigned int num_pipes);
-
-#endif
--
2.7.4
|
