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
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
|
From 1e7ec47716edfb0cc2a6a8a919888a59ec683031 Mon Sep 17 00:00:00 2001
From: Yue Hin Lau <Yuehin.Lau@amd.com>
Date: Sat, 19 Aug 2017 12:10:28 -0400
Subject: [PATCH 0991/4131] drm/amd/display: cleanup naming of DCN DPP
functions
Signed-off-by: Yue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
---
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 41 +++++++++++-----------
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 25 ++++++++-----
.../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 20 +++++------
.../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 +-
4 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
index f0e74af..3072249 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
@@ -123,7 +123,7 @@ void dpp_set_gamut_remap_bypass(struct dcn10_dpp *xfm)
#define IDENTITY_RATIO(ratio) (dal_fixed31_32_u2d19(ratio) == (1 << 19))
-static bool dpp_get_optimal_number_of_taps(
+bool dpp_get_optimal_number_of_taps(
struct transform *xfm,
struct scaler_data *scl_data,
const struct scaling_taps *in_taps)
@@ -182,7 +182,7 @@ static bool dpp_get_optimal_number_of_taps(
return true;
}
-static void dpp_reset(struct transform *xfm_base)
+void dpp_reset(struct transform *xfm_base)
{
struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base);
@@ -197,26 +197,26 @@ static void dpp_reset(struct transform *xfm_base)
-static bool oppn10_set_regamma_pwl(
+static bool dcn10_dpp_cm_set_regamma_pwl(
struct transform *xfm_base, const struct pwl_params *params)
{
struct dcn10_dpp *xfm = TO_DCN10_DPP(xfm_base);
- oppn10_power_on_regamma_lut(xfm_base, true);
- opp_configure_regamma_lut(xfm_base, xfm->is_write_to_ram_a_safe);
+ dcn10_dpp_cm_power_on_regamma_lut(xfm_base, true);
+ dcn10_dpp_cm_configure_regamma_lut(xfm_base, xfm->is_write_to_ram_a_safe);
if (xfm->is_write_to_ram_a_safe)
- opp_program_regamma_luta_settings(xfm_base, params);
+ dcn10_dpp_cm_program_regamma_luta_settings(xfm_base, params);
else
- opp_program_regamma_lutb_settings(xfm_base, params);
+ dcn10_dpp_cm_program_regamma_lutb_settings(xfm_base, params);
- opp_program_regamma_lut(
+ dcn10_dpp_cm_program_regamma_lut(
xfm_base, params->rgb_resulted, params->hw_points_num);
return true;
}
-static void oppn10_set_regamma_mode(
+static void dcn10_dpp_cm_set_regamma_mode(
struct transform *xfm_base,
enum opp_regamma mode)
{
@@ -251,20 +251,21 @@ static void oppn10_set_regamma_mode(
static struct transform_funcs dcn10_dpp_funcs = {
.transform_reset = dpp_reset,
- .transform_set_scaler = dcn10_dpp_set_scaler_manual_scale,
+ .transform_set_scaler = dcn10_dpp_dscl_set_scaler_manual_scale,
.transform_get_optimal_number_of_taps = dpp_get_optimal_number_of_taps,
- .transform_set_gamut_remap = dcn_dpp_set_gamut_remap,
- .opp_set_csc_adjustment = oppn10_set_output_csc_adjustment,
- .opp_set_csc_default = oppn10_set_output_csc_default,
- .opp_power_on_regamma_lut = oppn10_power_on_regamma_lut,
- .opp_program_regamma_lut = opp_program_regamma_lut,
- .opp_configure_regamma_lut = opp_configure_regamma_lut,
- .opp_program_regamma_lutb_settings = opp_program_regamma_lutb_settings,
- .opp_program_regamma_luta_settings = opp_program_regamma_luta_settings,
- .opp_program_regamma_pwl = oppn10_set_regamma_pwl,
- .opp_set_regamma_mode = oppn10_set_regamma_mode,
+ .transform_set_gamut_remap = dcn10_dpp_cm_set_gamut_remap,
+ .opp_set_csc_adjustment = dcn10_dpp_cm_set_output_csc_adjustment,
+ .opp_set_csc_default = dcn10_dpp_cm_set_output_csc_default,
+ .opp_power_on_regamma_lut = dcn10_dpp_cm_power_on_regamma_lut,
+ .opp_program_regamma_lut = dcn10_dpp_cm_program_regamma_lut,
+ .opp_configure_regamma_lut = dcn10_dpp_cm_configure_regamma_lut,
+ .opp_program_regamma_lutb_settings = dcn10_dpp_cm_program_regamma_lutb_settings,
+ .opp_program_regamma_luta_settings = dcn10_dpp_cm_program_regamma_luta_settings,
+ .opp_program_regamma_pwl = dcn10_dpp_cm_set_regamma_pwl,
+ .opp_set_regamma_mode = dcn10_dpp_cm_set_regamma_mode,
};
+
/*****************************************/
/* Constructor, Destructor */
/*****************************************/
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h
index a4dfdb9..18ee338 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h
@@ -1387,41 +1387,48 @@ struct dcn10_dpp {
bool is_write_to_ram_a_safe;
};
-void opp_program_regamma_lut(
+bool dpp_get_optimal_number_of_taps(
+ struct transform *xfm,
+ struct scaler_data *scl_data,
+ const struct scaling_taps *in_taps);
+
+void dpp_reset(struct transform *xfm_base);
+
+void dcn10_dpp_cm_program_regamma_lut(
struct transform *xfm_base,
const struct pwl_result_data *rgb,
uint32_t num);
-void oppn10_power_on_regamma_lut(
+void dcn10_dpp_cm_power_on_regamma_lut(
struct transform *xfm_base,
bool power_on);
-void opp_configure_regamma_lut(
+void dcn10_dpp_cm_configure_regamma_lut(
struct transform *xfm_base,
bool is_ram_a);
/*program re gamma RAM A*/
-void opp_program_regamma_luta_settings(
+void dcn10_dpp_cm_program_regamma_luta_settings(
struct transform *xfm_base,
const struct pwl_params *params);
/*program re gamma RAM B*/
-void opp_program_regamma_lutb_settings(
+void dcn10_dpp_cm_program_regamma_lutb_settings(
struct transform *xfm_base,
const struct pwl_params *params);
-void oppn10_set_output_csc_adjustment(
+void dcn10_dpp_cm_set_output_csc_adjustment(
struct transform *xfm_base,
const struct out_csc_color_matrix *tbl_entry);
-void oppn10_set_output_csc_default(
+void dcn10_dpp_cm_set_output_csc_default(
struct transform *xfm_base,
const struct default_adjustment *default_adjust);
-void dcn_dpp_set_gamut_remap(
+void dcn10_dpp_cm_set_gamut_remap(
struct transform *xfm,
const struct xfm_grph_csc_adjustment *adjust);
-void dcn10_dpp_set_scaler_manual_scale(
+void dcn10_dpp_dscl_set_scaler_manual_scale(
struct transform *xfm_base,
const struct scaler_data *scl_data);
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
index 7eb4334..9ff283b 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
@@ -221,7 +221,7 @@ static void program_gamut_remap(
}
-void dcn_dpp_set_gamut_remap(
+void dcn10_dpp_cm_set_gamut_remap(
struct transform *xfm,
const struct xfm_grph_csc_adjustment *adjust)
{
@@ -256,7 +256,7 @@ void dcn_dpp_set_gamut_remap(
}
}
-void oppn10_set_output_csc_default(
+void dcn10_dpp_cm_set_output_csc_default(
struct transform *xfm_base,
const struct default_adjustment *default_adjust)
{
@@ -293,7 +293,7 @@ void oppn10_set_output_csc_default(
}
-static void oppn10_program_color_matrix(
+static void dcn10_dpp_cm_program_color_matrix(
struct dcn10_dpp *xfm,
const struct out_csc_color_matrix *tbl_entry)
{
@@ -363,7 +363,7 @@ static void oppn10_program_color_matrix(
}
}
-void oppn10_set_output_csc_adjustment(
+void dcn10_dpp_cm_set_output_csc_adjustment(
struct transform *xfm_base,
const struct out_csc_color_matrix *tbl_entry)
{
@@ -399,10 +399,10 @@ void oppn10_set_output_csc_adjustment(
*/
REG_SET(CM_OCSC_CONTROL, 0, CM_OCSC_MODE, ocsc_mode);
- oppn10_program_color_matrix(xfm, tbl_entry);
+ dcn10_dpp_cm_program_color_matrix(xfm, tbl_entry);
}
-void oppn10_power_on_regamma_lut(
+void dcn10_dpp_cm_power_on_regamma_lut(
struct transform *xfm_base,
bool power_on)
{
@@ -412,7 +412,7 @@ void oppn10_power_on_regamma_lut(
}
-void opp_program_regamma_lut(
+void dcn10_dpp_cm_program_regamma_lut(
struct transform *xfm_base,
const struct pwl_result_data *rgb,
uint32_t num)
@@ -435,7 +435,7 @@ void opp_program_regamma_lut(
}
-void opp_configure_regamma_lut(
+void dcn10_dpp_cm_configure_regamma_lut(
struct transform *xfm_base,
bool is_ram_a)
{
@@ -449,7 +449,7 @@ void opp_configure_regamma_lut(
}
/*program re gamma RAM A*/
-void opp_program_regamma_luta_settings(
+void dcn10_dpp_cm_program_regamma_luta_settings(
struct transform *xfm_base,
const struct pwl_params *params)
{
@@ -612,7 +612,7 @@ void opp_program_regamma_luta_settings(
}
/*program re gamma RAM B*/
-void opp_program_regamma_lutb_settings(
+void dcn10_dpp_cm_program_regamma_lutb_settings(
struct transform *xfm_base,
const struct pwl_params *params)
{
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
index 95f014b..76d5f5d 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
@@ -636,7 +636,7 @@ static void dpp_set_recout(
}
/* Main function to program scaler and line buffer in manual scaling mode */
-void dcn10_dpp_set_scaler_manual_scale(
+void dcn10_dpp_dscl_set_scaler_manual_scale(
struct transform *xfm_base,
const struct scaler_data *scl_data)
{
--
2.7.4
|
