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
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
|
From 5244ef563b21717a742df33be094e4804821c222 Mon Sep 17 00:00:00 2001
From: Wenjing Liu <Wenjing.Liu@amd.com>
Date: Wed, 30 Nov 2016 12:10:35 -0500
Subject: [PATCH 0028/4131] drm/amd/display: Update rgb limited range csc
matrix calculation
The issue causes hue adjustment for rgb
limited range color space programmed wrong.
Update calculation formula for rgb limited range
Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/modules/color/color.c | 300 ++++++++++++++++------
1 file changed, 216 insertions(+), 84 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/modules/color/color.c b/drivers/gpu/drm/amd/display/modules/color/color.c
index cf030b1..30d09d3 100644
--- a/drivers/gpu/drm/amd/display/modules/color/color.c
+++ b/drivers/gpu/drm/amd/display/modules/color/color.c
@@ -854,26 +854,60 @@ static void calculate_rgb_matrix_legacy(struct core_color *core_color,
rgb_matrix[11] = grph_bright;
}
-static void calculate_rgb_limited_range_matrix(struct core_color *core_color,
- unsigned int sink_index, struct fixed31_32 *rgb_matrix)
+static void calculate_rgb_limited_range_matrix_legacy(
+ struct core_color *core_color, unsigned int sink_index,
+ struct fixed31_32 *rgb_matrix)
{
- struct fixed31_32 ideal[12];
-
- static const int32_t matrix_[] = {
- 85546875, 0, 0, 6250000,
- 0, 85546875, 0, 6250000,
- 0, 0, 85546875, 6250000
- };
-
- uint32_t i = 0;
+ const struct fixed31_32 k1 =
+ dal_fixed31_32_from_fraction(701000, 1000000);
+ const struct fixed31_32 k2 =
+ dal_fixed31_32_from_fraction(236568, 1000000);
+ const struct fixed31_32 k3 =
+ dal_fixed31_32_from_fraction(-587000, 1000000);
+ const struct fixed31_32 k4 =
+ dal_fixed31_32_from_fraction(464432, 1000000);
+ const struct fixed31_32 k5 =
+ dal_fixed31_32_from_fraction(-114000, 1000000);
+ const struct fixed31_32 k6 =
+ dal_fixed31_32_from_fraction(-701000, 1000000);
+ const struct fixed31_32 k7 =
+ dal_fixed31_32_from_fraction(-299000, 1000000);
+ const struct fixed31_32 k8 =
+ dal_fixed31_32_from_fraction(-292569, 1000000);
+ const struct fixed31_32 k9 =
+ dal_fixed31_32_from_fraction(413000, 1000000);
+ const struct fixed31_32 k10 =
+ dal_fixed31_32_from_fraction(-92482, 1000000);
+ const struct fixed31_32 k11 =
+ dal_fixed31_32_from_fraction(-114000, 1000000);
+ const struct fixed31_32 k12 =
+ dal_fixed31_32_from_fraction(385051, 1000000);
+ const struct fixed31_32 k13 =
+ dal_fixed31_32_from_fraction(-299000, 1000000);
+ const struct fixed31_32 k14 =
+ dal_fixed31_32_from_fraction(886000, 1000000);
+ const struct fixed31_32 k15 =
+ dal_fixed31_32_from_fraction(-587000, 1000000);
+ const struct fixed31_32 k16 =
+ dal_fixed31_32_from_fraction(-741914, 1000000);
+ const struct fixed31_32 k17 =
+ dal_fixed31_32_from_fraction(886000, 1000000);
+ const struct fixed31_32 k18 =
+ dal_fixed31_32_from_fraction(-144086, 1000000);
- do {
- ideal[i] = dal_fixed31_32_from_fraction(
- matrix_[i],
- 100000000);
- ++i;
- } while (i != ARRAY_SIZE(matrix_));
+ const struct fixed31_32 luma_r =
+ dal_fixed31_32_from_fraction(299, 1000);
+ const struct fixed31_32 luma_g =
+ dal_fixed31_32_from_fraction(587, 1000);
+ const struct fixed31_32 luma_b =
+ dal_fixed31_32_from_fraction(114, 1000);
+ const struct fixed31_32 luma_scale =
+ dal_fixed31_32_from_fraction(875855, 1000000);
+ const struct fixed31_32 rgb_scale =
+ dal_fixed31_32_from_fraction(85546875, 100000000);
+ const struct fixed31_32 rgb_bias =
+ dal_fixed31_32_from_fraction(625, 10000);
struct fixed31_32 grph_cont;
struct fixed31_32 grph_sat;
@@ -885,84 +919,182 @@ static void calculate_rgb_limited_range_matrix(struct core_color *core_color,
core_color, sink_index, &grph_cont, &grph_sat,
&grph_bright, &sin_grph_hue, &cos_grph_hue);
- const struct fixed31_32 multiplier =
- dal_fixed31_32_mul(grph_cont, grph_sat);
-
- rgb_matrix[8] = dal_fixed31_32_mul(ideal[0], grph_cont);
+ /* COEF_1_1 = GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K1 +*/
+ /* Sin(GrphHue) * K2))*/
+ /* (Cos(GrphHue) * K1 + Sin(GrphHue) * K2)*/
+ rgb_matrix[0] =
+ dal_fixed31_32_add(
+ dal_fixed31_32_mul(cos_grph_hue, k1),
+ dal_fixed31_32_mul(sin_grph_hue, k2));
+ /* GrphSat * (Cos(GrphHue) * K1 + Sin(GrphHue) * K2 */
+ rgb_matrix[0] = dal_fixed31_32_mul(grph_sat, rgb_matrix[0]);
+ /* (LumaR + GrphSat * (Cos(GrphHue) * K1 + Sin(GrphHue) * K2))*/
+ rgb_matrix[0] = dal_fixed31_32_add(luma_r, rgb_matrix[0]);
+ /* GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K1 + Sin(GrphHue)**/
+ /* K2))*/
+ rgb_matrix[0] = dal_fixed31_32_mul(grph_cont, rgb_matrix[0]);
+ /* LumaScale * GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K1 + */
+ /* Sin(GrphHue) * K2))*/
+ rgb_matrix[0] = dal_fixed31_32_mul(luma_scale, rgb_matrix[0]);
- rgb_matrix[9] = dal_fixed31_32_mul(ideal[1], grph_cont);
+ /* COEF_1_2 = GrphCont * (LumaG + GrphSat * (Cos(GrphHue) * K3 +*/
+ /* Sin(GrphHue) * K4))*/
+ /* (Cos(GrphHue) * K3 + Sin(GrphHue) * K4)*/
+ rgb_matrix[1] =
+ dal_fixed31_32_add(
+ dal_fixed31_32_mul(cos_grph_hue, k3),
+ dal_fixed31_32_mul(sin_grph_hue, k4));
+ /* GrphSat * (Cos(GrphHue) * K3 + Sin(GrphHue) * K4)*/
+ rgb_matrix[1] = dal_fixed31_32_mul(grph_sat, rgb_matrix[1]);
+ /* (LumaG + GrphSat * (Cos(GrphHue) * K3 + Sin(GrphHue) * K4))*/
+ rgb_matrix[1] = dal_fixed31_32_add(luma_g, rgb_matrix[1]);
+ /* GrphCont * (LumaG + GrphSat * (Cos(GrphHue) * K3 + Sin(GrphHue)**/
+ /* K4))*/
+ rgb_matrix[1] = dal_fixed31_32_mul(grph_cont, rgb_matrix[1]);
+ /* LumaScale * GrphCont * (LumaG + GrphSat *(Cos(GrphHue) * K3 + */
+ /* Sin(GrphHue) * K4))*/
+ rgb_matrix[1] = dal_fixed31_32_mul(luma_scale, rgb_matrix[1]);
- rgb_matrix[10] = dal_fixed31_32_mul(ideal[2], grph_cont);
+ /* COEF_1_3 = GrphCont * (LumaB + GrphSat * (Cos(GrphHue) * K5 +*/
+ /* Sin(GrphHue) * K6))*/
+ /* (Cos(GrphHue) * K5 + Sin(GrphHue) * K6)*/
+ rgb_matrix[2] =
+ dal_fixed31_32_add(
+ dal_fixed31_32_mul(cos_grph_hue, k5),
+ dal_fixed31_32_mul(sin_grph_hue, k6));
+ /* GrphSat * (Cos(GrphHue) * K5 + Sin(GrphHue) * K6)*/
+ rgb_matrix[2] = dal_fixed31_32_mul(grph_sat, rgb_matrix[2]);
+ /* LumaB + GrphSat * (Cos(GrphHue) * K5 + Sin(GrphHue) * K6)*/
+ rgb_matrix[2] = dal_fixed31_32_add(luma_b, rgb_matrix[2]);
+ /* GrphCont * (LumaB + GrphSat * (Cos(GrphHue) * K5 + Sin(GrphHue)**/
+ /* K6))*/
+ rgb_matrix[2] = dal_fixed31_32_mul(grph_cont, rgb_matrix[2]);
+ /* LumaScale * GrphCont * (LumaB + GrphSat *(Cos(GrphHue) * K5 + */
+ /* Sin(GrphHue) * K6))*/
+ rgb_matrix[2] = dal_fixed31_32_mul(luma_scale, rgb_matrix[2]);
- rgb_matrix[11] = dal_fixed31_32_add(
- ideal[3],
- dal_fixed31_32_mul(
- grph_bright,
- dal_fixed31_32_from_fraction(86, 100)));
+ /* COEF_1_4 = RGBBias + RGBScale * GrphBright*/
+ rgb_matrix[3] = dal_fixed31_32_add(
+ rgb_bias,
+ dal_fixed31_32_mul(rgb_scale, grph_bright));
- rgb_matrix[0] = dal_fixed31_32_mul(
- multiplier,
+ /* COEF_2_1 = GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K7 +*/
+ /* Sin(GrphHue) * K8))*/
+ /* (Cos(GrphHue) * K7 + Sin(GrphHue) * K8)*/
+ rgb_matrix[4] =
dal_fixed31_32_add(
- dal_fixed31_32_mul(
- ideal[8],
- sin_grph_hue),
- dal_fixed31_32_mul(
- ideal[4],
- cos_grph_hue)));
+ dal_fixed31_32_mul(cos_grph_hue, k7),
+ dal_fixed31_32_mul(sin_grph_hue, k8));
+ /* GrphSat * (Cos(GrphHue) * K7 + Sin(GrphHue) * K8)*/
+ rgb_matrix[4] = dal_fixed31_32_mul(grph_sat, rgb_matrix[4]);
+ /* (LumaR + GrphSat * (Cos(GrphHue) * K7 + Sin(GrphHue) * K8))*/
+ rgb_matrix[4] = dal_fixed31_32_add(luma_r, rgb_matrix[4]);
+ /* GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K7 + Sin(GrphHue)**/
+ /* K8))*/
+ rgb_matrix[4] = dal_fixed31_32_mul(grph_cont, rgb_matrix[4]);
+ /* LumaScale * GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K7 + */
+ /* Sin(GrphHue) * K8))*/
+ rgb_matrix[4] = dal_fixed31_32_mul(luma_scale, rgb_matrix[4]);
- rgb_matrix[1] = dal_fixed31_32_mul(
- multiplier,
+ /* COEF_2_2 = GrphCont * (LumaG + GrphSat * (Cos(GrphHue) * K9 +*/
+ /* Sin(GrphHue) * K10))*/
+ /* (Cos(GrphHue) * K9 + Sin(GrphHue) * K10))*/
+ rgb_matrix[5] =
dal_fixed31_32_add(
- dal_fixed31_32_mul(
- ideal[9],
- sin_grph_hue),
- dal_fixed31_32_mul(
- ideal[5],
- cos_grph_hue)));
+ dal_fixed31_32_mul(cos_grph_hue, k9),
+ dal_fixed31_32_mul(sin_grph_hue, k10));
+ /* GrphSat * (Cos(GrphHue) * K9 + Sin(GrphHue) * K10))*/
+ rgb_matrix[5] = dal_fixed31_32_mul(grph_sat, rgb_matrix[5]);
+ /* (LumaG + GrphSat * (Cos(GrphHue) * K9 + Sin(GrphHue) * K10))*/
+ rgb_matrix[5] = dal_fixed31_32_add(luma_g, rgb_matrix[5]);
+ /* GrphCont * (LumaG + GrphSat * (Cos(GrphHue) * K9 + Sin(GrphHue)**/
+ /* K10))*/
+ rgb_matrix[5] = dal_fixed31_32_mul(grph_cont, rgb_matrix[5]);
+ /* LumaScale * GrphCont * (LumaG + GrphSat *(Cos(GrphHue) * K9 + */
+ /* Sin(GrphHue) * K10))*/
+ rgb_matrix[5] = dal_fixed31_32_mul(luma_scale, rgb_matrix[5]);
- rgb_matrix[2] = dal_fixed31_32_mul(
- multiplier,
+ /* COEF_2_3 = GrphCont * (LumaB + GrphSat * (Cos(GrphHue) * K11 +*/
+ /* Sin(GrphHue) * K12))*/
+ /* (Cos(GrphHue) * K11 + Sin(GrphHue) * K12))*/
+ rgb_matrix[6] =
dal_fixed31_32_add(
- dal_fixed31_32_mul(
- ideal[10],
- sin_grph_hue),
- dal_fixed31_32_mul(
- ideal[6],
- cos_grph_hue)));
+ dal_fixed31_32_mul(cos_grph_hue, k11),
+ dal_fixed31_32_mul(sin_grph_hue, k12));
+ /* GrphSat * (Cos(GrphHue) * K11 + Sin(GrphHue) * K12))*/
+ rgb_matrix[6] = dal_fixed31_32_mul(grph_sat, rgb_matrix[6]);
+ /* (LumaB + GrphSat * (Cos(GrphHue) * K11 + Sin(GrphHue) * K12))*/
+ rgb_matrix[6] = dal_fixed31_32_add(luma_b, rgb_matrix[6]);
+ /* GrphCont * (LumaB + GrphSat * (Cos(GrphHue) * K11 + Sin(GrphHue)**/
+ /* K12))*/
+ rgb_matrix[6] = dal_fixed31_32_mul(grph_cont, rgb_matrix[6]);
+ /* LumaScale * GrphCont * (LumaB + GrphSat *(Cos(GrphHue) * K11 +*/
+ /* Sin(GrphHue) * K12)) */
+ rgb_matrix[6] = dal_fixed31_32_mul(luma_scale, rgb_matrix[6]);
- rgb_matrix[3] = ideal[7];
+ /* COEF_2_4 = RGBBias + RGBScale * GrphBright*/
+ rgb_matrix[7] = dal_fixed31_32_add(
+ rgb_bias,
+ dal_fixed31_32_mul(rgb_scale, grph_bright));
- rgb_matrix[4] = dal_fixed31_32_mul(
- multiplier,
- dal_fixed31_32_sub(
- dal_fixed31_32_mul(
- ideal[8],
- cos_grph_hue),
- dal_fixed31_32_mul(
- ideal[4],
- sin_grph_hue)));
+ /* COEF_3_1 = GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K13 +*/
+ /* Sin(GrphHue) * K14))*/
+ /* (Cos(GrphHue) * K13 + Sin(GrphHue) * K14)) */
+ rgb_matrix[8] =
+ dal_fixed31_32_add(
+ dal_fixed31_32_mul(cos_grph_hue, k13),
+ dal_fixed31_32_mul(sin_grph_hue, k14));
+ /* GrphSat * (Cos(GrphHue) * K13 + Sin(GrphHue) * K14)) */
+ rgb_matrix[8] = dal_fixed31_32_mul(grph_sat, rgb_matrix[8]);
+ /* (LumaR + GrphSat * (Cos(GrphHue) * K13 + Sin(GrphHue) * K14)) */
+ rgb_matrix[8] = dal_fixed31_32_add(luma_r, rgb_matrix[8]);
+ /* GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K13 + Sin(GrphHue)**/
+ /* K14)) */
+ rgb_matrix[8] = dal_fixed31_32_mul(grph_cont, rgb_matrix[8]);
+ /* LumaScale * GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K13 +*/
+ /* Sin(GrphHue) * K14))*/
+ rgb_matrix[8] = dal_fixed31_32_mul(luma_scale, rgb_matrix[8]);
- rgb_matrix[5] = dal_fixed31_32_mul(
- multiplier,
- dal_fixed31_32_sub(
- dal_fixed31_32_mul(
- ideal[9],
- cos_grph_hue),
- dal_fixed31_32_mul(
- ideal[5],
- sin_grph_hue)));
+ /* COEF_3_2 = GrphCont * (LumaG + GrphSat * (Cos(GrphHue) * K15 +*/
+ /* Sin(GrphHue) * K16)) */
+ /* GrphSat * (Cos(GrphHue) * K15 + Sin(GrphHue) * K16) */
+ rgb_matrix[9] =
+ dal_fixed31_32_add(
+ dal_fixed31_32_mul(cos_grph_hue, k15),
+ dal_fixed31_32_mul(sin_grph_hue, k16));
+ /* (LumaG + GrphSat * (Cos(GrphHue) * K15 + Sin(GrphHue) * K16)) */
+ rgb_matrix[9] = dal_fixed31_32_mul(grph_sat, rgb_matrix[9]);
+ /* (LumaG + GrphSat * (Cos(GrphHue) * K15 + Sin(GrphHue) * K16)) */
+ rgb_matrix[9] = dal_fixed31_32_add(luma_g, rgb_matrix[9]);
+ /* GrphCont * (LumaG + GrphSat * (Cos(GrphHue) * K15 + Sin(GrphHue)**/
+ /* K16)) */
+ rgb_matrix[9] = dal_fixed31_32_mul(grph_cont, rgb_matrix[9]);
+ /* LumaScale * GrphCont * (LumaG + GrphSat *(Cos(GrphHue) * K15 + */
+ /* Sin(GrphHue) * K16))*/
+ rgb_matrix[9] = dal_fixed31_32_mul(luma_scale, rgb_matrix[9]);
- rgb_matrix[6] = dal_fixed31_32_mul(
- multiplier,
- dal_fixed31_32_sub(
- dal_fixed31_32_mul(
- ideal[10],
- cos_grph_hue),
- dal_fixed31_32_mul(
- ideal[6],
- sin_grph_hue)));
+ /* COEF_3_3 = GrphCont * (LumaB + GrphSat * (Cos(GrphHue) * K17 +*/
+ /* Sin(GrphHue) * K18)) */
+ /* (Cos(GrphHue) * K17 + Sin(GrphHue) * K18)) */
+ rgb_matrix[10] =
+ dal_fixed31_32_add(
+ dal_fixed31_32_mul(cos_grph_hue, k17),
+ dal_fixed31_32_mul(sin_grph_hue, k18));
+ /* GrphSat * (Cos(GrphHue) * K17 + Sin(GrphHue) * K18)) */
+ rgb_matrix[10] = dal_fixed31_32_mul(grph_sat, rgb_matrix[10]);
+ /* (LumaB + GrphSat * (Cos(GrphHue) * K17 + Sin(GrphHue) * K18)) */
+ rgb_matrix[10] = dal_fixed31_32_add(luma_b, rgb_matrix[10]);
+ /* GrphCont * (LumaB + GrphSat * (Cos(GrphHue) * K17 + Sin(GrphHue)**/
+ /* K18)) */
+ rgb_matrix[10] = dal_fixed31_32_mul(grph_cont, rgb_matrix[10]);
+ /* LumaScale * GrphCont * (LumaB + GrphSat *(Cos(GrphHue) * */
+ /* K17 + Sin(GrphHue) * K18))*/
+ rgb_matrix[10] = dal_fixed31_32_mul(luma_scale, rgb_matrix[10]);
- rgb_matrix[7] = ideal[11];
+ /* COEF_3_4 = RGBBias + RGBScale * GrphBright */
+ rgb_matrix[11] = dal_fixed31_32_add(
+ rgb_bias,
+ dal_fixed31_32_mul(rgb_scale, grph_bright));
}
static void calculate_yuv_matrix(struct core_color *core_color,
@@ -1110,9 +1242,9 @@ static void calculate_csc_matrix(struct core_color *core_color,
(csc_matrix, fixed_csc_matrix, 12);
break;
case COLOR_SPACE_SRGB_LIMITED:
- calculate_rgb_limited_range_matrix(core_color, sink_index,
- fixed_csc_matrix);
- convert_float_matrix(csc_matrix, fixed_csc_matrix, 12);
+ calculate_rgb_limited_range_matrix_legacy(
+ core_color, sink_index, fixed_csc_matrix);
+ convert_float_matrix_legacy(csc_matrix, fixed_csc_matrix, 12);
break;
case COLOR_SPACE_YCBCR601:
case COLOR_SPACE_YCBCR709:
--
2.7.4
|
