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
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
|
From a45897c09683669ebef88e7603bc21cccedaa8ee Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 29 Sep 2017 15:45:08 +1000
Subject: [PATCH 2437/4131] amdgpu/dc: inline a bunch of the fixed 31_32
helpers.
This decreases code size by a few hundred bytes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
---
drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 122 -------------------
drivers/gpu/drm/amd/display/include/fixed31_32.h | 132 +++++++++++++++------
2 files changed, 93 insertions(+), 161 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c b/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c
index 546ed67..578691c 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c
@@ -132,79 +132,6 @@ struct fixed31_32 dal_fixed31_32_from_int(
return res;
}
-struct fixed31_32 dal_fixed31_32_neg(
- struct fixed31_32 arg)
-{
- struct fixed31_32 res;
-
- res.value = -arg.value;
-
- return res;
-}
-
-struct fixed31_32 dal_fixed31_32_abs(
- struct fixed31_32 arg)
-{
- if (arg.value < 0)
- return dal_fixed31_32_neg(arg);
- else
- return arg;
-}
-
-bool dal_fixed31_32_lt(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2)
-{
- return arg1.value < arg2.value;
-}
-
-bool dal_fixed31_32_le(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2)
-{
- return arg1.value <= arg2.value;
-}
-
-bool dal_fixed31_32_eq(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2)
-{
- return arg1.value == arg2.value;
-}
-
-struct fixed31_32 dal_fixed31_32_min(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2)
-{
- if (arg1.value <= arg2.value)
- return arg1;
- else
- return arg2;
-}
-
-struct fixed31_32 dal_fixed31_32_max(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2)
-{
- if (arg1.value <= arg2.value)
- return arg2;
- else
- return arg1;
-}
-
-struct fixed31_32 dal_fixed31_32_clamp(
- struct fixed31_32 arg,
- struct fixed31_32 min_value,
- struct fixed31_32 max_value)
-{
- if (dal_fixed31_32_le(arg, min_value))
- return min_value;
- else if (dal_fixed31_32_le(max_value, arg))
- return max_value;
- else
- return arg;
-}
-
struct fixed31_32 dal_fixed31_32_shl(
struct fixed31_32 arg,
uint8_t shift)
@@ -219,19 +146,6 @@ struct fixed31_32 dal_fixed31_32_shl(
return res;
}
-struct fixed31_32 dal_fixed31_32_shr(
- struct fixed31_32 arg,
- uint8_t shift)
-{
- struct fixed31_32 res;
-
- ASSERT(shift < 64);
-
- res.value = arg.value >> shift;
-
- return res;
-}
-
struct fixed31_32 dal_fixed31_32_add(
struct fixed31_32 arg1,
struct fixed31_32 arg2)
@@ -246,24 +160,6 @@ struct fixed31_32 dal_fixed31_32_add(
return res;
}
-struct fixed31_32 dal_fixed31_32_add_int(
- struct fixed31_32 arg1,
- int32_t arg2)
-{
- return dal_fixed31_32_add(
- arg1,
- dal_fixed31_32_from_int(arg2));
-}
-
-struct fixed31_32 dal_fixed31_32_sub_int(
- struct fixed31_32 arg1,
- int32_t arg2)
-{
- return dal_fixed31_32_sub(
- arg1,
- dal_fixed31_32_from_int(arg2));
-}
-
struct fixed31_32 dal_fixed31_32_sub(
struct fixed31_32 arg1,
struct fixed31_32 arg2)
@@ -278,15 +174,6 @@ struct fixed31_32 dal_fixed31_32_sub(
return res;
}
-struct fixed31_32 dal_fixed31_32_mul_int(
- struct fixed31_32 arg1,
- int32_t arg2)
-{
- return dal_fixed31_32_mul(
- arg1,
- dal_fixed31_32_from_int(arg2));
-}
-
struct fixed31_32 dal_fixed31_32_mul(
struct fixed31_32 arg1,
struct fixed31_32 arg2)
@@ -390,15 +277,6 @@ struct fixed31_32 dal_fixed31_32_div_int(
dal_fixed31_32_from_int(arg2).value);
}
-struct fixed31_32 dal_fixed31_32_div(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2)
-{
- return dal_fixed31_32_from_fraction(
- arg1.value,
- arg2.value);
-}
-
struct fixed31_32 dal_fixed31_32_recip(
struct fixed31_32 arg)
{
diff --git a/drivers/gpu/drm/amd/display/include/fixed31_32.h b/drivers/gpu/drm/amd/display/include/fixed31_32.h
index 5a4364d..f0bc3c4 100644
--- a/drivers/gpu/drm/amd/display/include/fixed31_32.h
+++ b/drivers/gpu/drm/amd/display/include/fixed31_32.h
@@ -90,15 +90,26 @@ struct fixed31_32 dal_fixed31_32_from_int(
* @brief
* result = -arg
*/
-struct fixed31_32 dal_fixed31_32_neg(
- struct fixed31_32 arg);
+static inline struct fixed31_32 dal_fixed31_32_neg(struct fixed31_32 arg)
+{
+ struct fixed31_32 res;
+
+ res.value = -arg.value;
+
+ return res;
+}
/*
* @brief
* result = abs(arg) := (arg >= 0) ? arg : -arg
*/
-struct fixed31_32 dal_fixed31_32_abs(
- struct fixed31_32 arg);
+static inline struct fixed31_32 dal_fixed31_32_abs(struct fixed31_32 arg)
+{
+ if (arg.value < 0)
+ return dal_fixed31_32_neg(arg);
+ else
+ return arg;
+}
/*
* @brief
@@ -109,41 +120,57 @@ struct fixed31_32 dal_fixed31_32_abs(
* @brief
* result = arg1 < arg2
*/
-bool dal_fixed31_32_lt(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline bool dal_fixed31_32_lt(struct fixed31_32 arg1,
+ struct fixed31_32 arg2)
+{
+ return arg1.value < arg2.value;
+}
/*
* @brief
* result = arg1 <= arg2
*/
-bool dal_fixed31_32_le(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline bool dal_fixed31_32_le(struct fixed31_32 arg1,
+ struct fixed31_32 arg2)
+{
+ return arg1.value <= arg2.value;
+}
/*
* @brief
* result = arg1 == arg2
*/
-bool dal_fixed31_32_eq(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline bool dal_fixed31_32_eq(struct fixed31_32 arg1,
+ struct fixed31_32 arg2)
+{
+ return arg1.value == arg2.value;
+}
/*
* @brief
* result = min(arg1, arg2) := (arg1 <= arg2) ? arg1 : arg2
*/
-struct fixed31_32 dal_fixed31_32_min(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline struct fixed31_32 dal_fixed31_32_min(struct fixed31_32 arg1,
+ struct fixed31_32 arg2)
+{
+ if (arg1.value <= arg2.value)
+ return arg1;
+ else
+ return arg2;
+}
/*
* @brief
* result = max(arg1, arg2) := (arg1 <= arg2) ? arg2 : arg1
*/
-struct fixed31_32 dal_fixed31_32_max(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline struct fixed31_32 dal_fixed31_32_max(struct fixed31_32 arg1,
+ struct fixed31_32 arg2)
+{
+ if (arg1.value <= arg2.value)
+ return arg2;
+ else
+ return arg1;
+}
/*
* @brief
@@ -151,10 +178,18 @@ struct fixed31_32 dal_fixed31_32_max(
* result = | arg, when min_value < arg < max_value
* | max_value, when arg >= max_value
*/
-struct fixed31_32 dal_fixed31_32_clamp(
+static inline struct fixed31_32 dal_fixed31_32_clamp(
struct fixed31_32 arg,
struct fixed31_32 min_value,
- struct fixed31_32 max_value);
+ struct fixed31_32 max_value)
+{
+ if (dal_fixed31_32_le(arg, min_value))
+ return min_value;
+ else if (dal_fixed31_32_le(max_value, arg))
+ return max_value;
+ else
+ return arg;
+}
/*
* @brief
@@ -173,9 +208,14 @@ struct fixed31_32 dal_fixed31_32_shl(
* @brief
* result = arg >> shift
*/
-struct fixed31_32 dal_fixed31_32_shr(
+static inline struct fixed31_32 dal_fixed31_32_shr(
struct fixed31_32 arg,
- uint8_t shift);
+ uint8_t shift)
+{
+ struct fixed31_32 res;
+ res.value = arg.value >> shift;
+ return res;
+}
/*
* @brief
@@ -194,25 +234,32 @@ struct fixed31_32 dal_fixed31_32_add(
* @brief
* result = arg1 + arg2
*/
-struct fixed31_32 dal_fixed31_32_add_int(
- struct fixed31_32 arg1,
- int32_t arg2);
+static inline struct fixed31_32 dal_fixed31_32_add_int(struct fixed31_32 arg1,
+ int32_t arg2)
+{
+ return dal_fixed31_32_add(arg1,
+ dal_fixed31_32_from_int(arg2));
+}
/*
* @brief
* result = arg1 - arg2
*/
-struct fixed31_32 dal_fixed31_32_sub_int(
+struct fixed31_32 dal_fixed31_32_sub(
struct fixed31_32 arg1,
- int32_t arg2);
+ struct fixed31_32 arg2);
/*
* @brief
* result = arg1 - arg2
*/
-struct fixed31_32 dal_fixed31_32_sub(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline struct fixed31_32 dal_fixed31_32_sub_int(struct fixed31_32 arg1,
+ int32_t arg2)
+{
+ return dal_fixed31_32_sub(arg1,
+ dal_fixed31_32_from_int(arg2));
+}
+
/*
* @brief
@@ -223,17 +270,21 @@ struct fixed31_32 dal_fixed31_32_sub(
* @brief
* result = arg1 * arg2
*/
-struct fixed31_32 dal_fixed31_32_mul_int(
+struct fixed31_32 dal_fixed31_32_mul(
struct fixed31_32 arg1,
- int32_t arg2);
+ struct fixed31_32 arg2);
+
/*
* @brief
* result = arg1 * arg2
*/
-struct fixed31_32 dal_fixed31_32_mul(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline struct fixed31_32 dal_fixed31_32_mul_int(struct fixed31_32 arg1,
+ int32_t arg2)
+{
+ return dal_fixed31_32_mul(arg1,
+ dal_fixed31_32_from_int(arg2));
+}
/*
* @brief
@@ -254,9 +305,12 @@ struct fixed31_32 dal_fixed31_32_div_int(
* @brief
* result = arg1 / arg2
*/
-struct fixed31_32 dal_fixed31_32_div(
- struct fixed31_32 arg1,
- struct fixed31_32 arg2);
+static inline struct fixed31_32 dal_fixed31_32_div(struct fixed31_32 arg1,
+ struct fixed31_32 arg2)
+{
+ return dal_fixed31_32_from_fraction(arg1.value,
+ arg2.value);
+}
/*
* @brief
--
2.7.4
|
