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
|
From 0d7d11832f4cd3c2ac31a0b3197e16242860b9e6 Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Sat, 27 Feb 2016 14:41:11 -0500
Subject: [PATCH 0858/1110] drm/amd/dal: Use native memmove directly
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
---
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +-
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c | 11 +++--------
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c | 2 +-
drivers/gpu/drm/amd/dal/dc/basics/logger.c | 10 +++++-----
drivers/gpu/drm/amd/dal/dc/basics/vector.c | 12 ++++++------
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 8 ++++----
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 2 +-
drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c | 2 +-
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 10 +++++-----
drivers/gpu/drm/amd/dal/dc/core/dc_stream.c | 2 +-
drivers/gpu/drm/amd/dal/dc/dce110/dce110_opp_csc.c | 2 +-
drivers/gpu/drm/amd/dal/dc/dce80/dce80_opp_csc.c | 2 +-
drivers/gpu/drm/amd/dal/dc/dm_services.h | 2 --
13 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c
index 6876643..ed0b9d7 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -198,7 +198,7 @@ static struct dc_sink *dm_dp_mst_add_mst_sink(
if (!dc_sink)
return NULL;
- dm_memmove(dc_sink->dc_edid.raw_edid, edid, len);
+ memmove(dc_sink->dc_edid.raw_edid, edid, len);
dc_sink->dc_edid.length = len;
if (!dc_link_add_remote_sink(
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c
index 5823789..f587bc3 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_services.c
@@ -40,11 +40,6 @@
#define dm_realloc(ptr, size) krealloc(ptr, size, GFP_KERNEL)
#define dm_free(ptr) kfree(ptr)
-void dm_memmove(void *dst, const void *src, uint32_t size)
-{
- memmove(dst, src, size);
-}
-
int32_t dm_memcmp(const void *p1, const void *p2, uint32_t count)
{
return memcmp(p1, p2, count);
@@ -262,17 +257,17 @@ static void get_default_clock_levels(
switch (clk_type) {
case DM_PP_CLOCK_TYPE_DISPLAY_CLK:
clks->num_levels = 6;
- dm_memmove(clks->clocks_in_khz, disp_clks_in_khz,
+ memmove(clks->clocks_in_khz, disp_clks_in_khz,
sizeof(disp_clks_in_khz));
break;
case DM_PP_CLOCK_TYPE_ENGINE_CLK:
clks->num_levels = 6;
- dm_memmove(clks->clocks_in_khz, sclks_in_khz,
+ memmove(clks->clocks_in_khz, sclks_in_khz,
sizeof(sclks_in_khz));
break;
case DM_PP_CLOCK_TYPE_MEMORY_CLK:
clks->num_levels = 2;
- dm_memmove(clks->clocks_in_khz, mclks_in_khz,
+ memmove(clks->clocks_in_khz, mclks_in_khz,
sizeof(mclks_in_khz));
break;
default:
diff --git a/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c b/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c
index 9a68ed9..f7aea01 100644
--- a/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c
+++ b/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c
@@ -1365,7 +1365,7 @@ bool dal_adapter_service_get_integrated_info(
if (info == NULL || as->integrated_info == NULL)
return false;
- dm_memmove(info, as->integrated_info, sizeof(struct integrated_info));
+ memmove(info, as->integrated_info, sizeof(struct integrated_info));
return true;
}
diff --git a/drivers/gpu/drm/amd/dal/dc/basics/logger.c b/drivers/gpu/drm/amd/dal/dc/basics/logger.c
index 60c13fc..f637c3f 100644
--- a/drivers/gpu/drm/amd/dal/dc/basics/logger.c
+++ b/drivers/gpu/drm/amd/dal/dc/basics/logger.c
@@ -470,7 +470,7 @@ static void log_to_internal_buffer(struct log_entry *entry)
/* No wrap around, copy 'size' bytes
* from 'entry->buf' to 'log_buffer'
*/
- dm_memmove(logger->log_buffer +
+ memmove(logger->log_buffer +
logger->buffer_write_offset,
entry->buf, size);
logger->buffer_write_offset += size;
@@ -482,10 +482,10 @@ static void log_to_internal_buffer(struct log_entry *entry)
int space_after_wrap = total_free_space -
space_before_wrap;
- dm_memmove(logger->log_buffer +
+ memmove(logger->log_buffer +
logger->buffer_write_offset,
entry->buf, space_before_wrap);
- dm_memmove(logger->log_buffer, entry->buf +
+ memmove(logger->log_buffer, entry->buf +
space_before_wrap, space_after_wrap);
logger->buffer_write_offset = space_after_wrap;
@@ -499,7 +499,7 @@ static void log_to_internal_buffer(struct log_entry *entry)
flush_to_debug_console(logger);
/* Start writing to beginning of buffer */
- dm_memmove(logger->log_buffer, entry->buf, size);
+ memmove(logger->log_buffer, entry->buf, size);
logger->buffer_write_offset = size;
logger->buffer_read_offset = 0;
}
@@ -568,7 +568,7 @@ static void append_entry(
}
/* Todo: check if off by 1 byte due to \0 anywhere */
- dm_memmove(entry->buf + entry->buf_offset, buffer, buf_size);
+ memmove(entry->buf + entry->buf_offset, buffer, buf_size);
entry->buf_offset += buf_size;
}
diff --git a/drivers/gpu/drm/amd/dal/dc/basics/vector.c b/drivers/gpu/drm/amd/dal/dc/basics/vector.c
index 7ad7fef..bb72a18 100644
--- a/drivers/gpu/drm/amd/dal/dc/basics/vector.c
+++ b/drivers/gpu/drm/amd/dal/dc/basics/vector.c
@@ -77,7 +77,7 @@ bool dal_vector_presized_costruct(
* initialises the memory to. */
if (NULL != initial_value) {
for (i = 0; i < count; ++i)
- dm_memmove(
+ memmove(
vector->container + i * struct_size,
initial_value,
struct_size);
@@ -169,7 +169,7 @@ bool dal_vector_remove_at_index(
return false;
if (index != vector->count - 1)
- dm_memmove(
+ memmove(
vector->container + (index * vector->struct_size),
vector->container + ((index + 1) * vector->struct_size),
(vector->count - index - 1) * vector->struct_size);
@@ -189,7 +189,7 @@ void dal_vector_set_at_index(
BREAK_TO_DEBUGGER();
return;
}
- dm_memmove(
+ memmove(
where,
what,
vector->struct_size);
@@ -218,12 +218,12 @@ bool dal_vector_insert_at(
insert_address = vector->container + (vector->struct_size * position);
if (vector->count && position < vector->count)
- dm_memmove(
+ memmove(
insert_address + vector->struct_size,
insert_address,
vector->struct_size * (vector->count - position));
- dm_memmove(
+ memmove(
insert_address,
what,
vector->struct_size);
@@ -272,7 +272,7 @@ struct vector *dal_vector_clone(
}
/* copy vector's data */
- dm_memmove(vec_cloned->container, vector->container,
+ memmove(vec_cloned->container, vector->container,
vec_cloned->struct_size * vec_cloned->capacity);
return vec_cloned;
diff --git a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c
index 0fe8afc..a43da0c 100644
--- a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c
+++ b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c
@@ -2546,7 +2546,7 @@ static enum bp_result bios_parser_get_faked_edid_buf(
if (len < edid_size)
return BP_RESULT_BADINPUT; /* buffer not big enough to fill */
- dm_memmove(buff, &edid_record->ucFakeEDIDString, edid_size);
+ memmove(buff, &edid_record->ucFakeEDIDString, edid_size);
return BP_RESULT_OK;
}
@@ -4091,7 +4091,7 @@ static void process_ext_display_connection_info(struct bios_parser *bp)
return;
}
- dm_memmove(bp->bios_local_image, bp->bios, bp->bios_size);
+ memmove(bp->bios_local_image, bp->bios, bp->bios_size);
original_bios = bp->bios;
bp->bios = bp->bios_local_image;
connector_tbl =
@@ -4105,7 +4105,7 @@ static void process_ext_display_connection_info(struct bios_parser *bp)
/* Patching the bios image has failed. We will copy
* again original image provided and afterwards
* only remove null entries */
- dm_memmove(
+ memmove(
bp->bios_local_image,
original_bios,
bp->bios_size);
@@ -4122,7 +4122,7 @@ static void process_ext_display_connection_info(struct bios_parser *bp)
continue;
if (i != connectors_num) {
- dm_memmove(
+ memmove(
&connector_tbl->
asObjects[connectors_num],
object,
diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c
index f7a14a2..22017ff 100644
--- a/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c
+++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c
@@ -745,7 +745,7 @@ uint32_t dal_ddc_service_get_edid_buf_len(struct ddc_service *ddc)
void dal_ddc_service_get_edid_buf(struct ddc_service *ddc, uint8_t *edid_buf)
{
- dm_memmove(edid_buf,
+ memmove(edid_buf,
ddc->edid_buf, ddc->edid_buf_len);
}
diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c
index ca7aa20..e4ea886 100644
--- a/drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c
@@ -242,7 +242,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
size_in_bytes = lt_settings->link_settings.lane_count * sizeof(dpcd_lane[0]);
// 0x00103 - 0x00102
- dm_memmove(
+ memmove(
&dpcd_lt_buffer[DPCD_ADDRESS_LANE0_SET - dpcd_base_lt_offset],
dpcd_lane,
size_in_bytes);
diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c b/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c
index c214870..519329b 100644
--- a/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/dal/dc/core/dc_resource.c
@@ -909,7 +909,7 @@ static void translate_info_frame(const struct hw_info_frame *hw_info_frame,
uint8_t *ptr;
uint8_t i;
- dm_memmove(
+ memmove(
&encoder_info_frame->gamut,
&hw_info_frame->gamut_packet,
sizeof(struct hw_info_packet));
@@ -924,28 +924,28 @@ static void translate_info_frame(const struct hw_info_frame *hw_info_frame,
}
if (hw_info_frame->avi_info_packet.valid) {
- dm_memmove(
+ memmove(
&encoder_info_frame->avi,
&hw_info_frame->avi_info_packet,
sizeof(struct hw_info_packet));
}
if (hw_info_frame->vendor_info_packet.valid) {
- dm_memmove(
+ memmove(
&encoder_info_frame->vendor,
&hw_info_frame->vendor_info_packet,
sizeof(struct hw_info_packet));
}
if (hw_info_frame->spd_packet.valid) {
- dm_memmove(
+ memmove(
&encoder_info_frame->spd,
&hw_info_frame->spd_packet,
sizeof(struct hw_info_packet));
}
if (hw_info_frame->vsc_packet.valid) {
- dm_memmove(
+ memmove(
&encoder_info_frame->vsc,
&hw_info_frame->vsc_packet,
sizeof(struct hw_info_packet));
diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_stream.c b/drivers/gpu/drm/amd/dal/dc/core/dc_stream.c
index c78366a..b696401 100644
--- a/drivers/gpu/drm/amd/dal/dc/core/dc_stream.c
+++ b/drivers/gpu/drm/amd/dal/dc/core/dc_stream.c
@@ -108,7 +108,7 @@ static bool construct(struct core_stream *stream,
stream->public.audio_info.mode_count = dc_sink_data->edid_caps.audio_mode_count;
stream->public.audio_info.audio_latency = dc_sink_data->edid_caps.audio_latency;
stream->public.audio_info.video_latency = dc_sink_data->edid_caps.video_latency;
- dm_memmove(
+ memmove(
stream->public.audio_info.display_name,
dc_sink_data->edid_caps.display_name,
AUDIO_INFO_DISPLAY_NAME_SIZE_IN_CHARS);
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_opp_csc.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_opp_csc.c
index 5fb827a..b16d9b0 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_opp_csc.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_opp_csc.c
@@ -598,7 +598,7 @@ static void set_rgb_limited_range_adjustment(
calculate_adjustments(ideals, &adjustments, matrix);
- dm_memmove(change_matrix, matrix, sizeof(matrix));
+ memmove(change_matrix, matrix, sizeof(matrix));
/* from 1 -> 3 */
matrix[8] = change_matrix[0];
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_opp_csc.c b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_opp_csc.c
index 464f0ad..b39930e 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_opp_csc.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_opp_csc.c
@@ -599,7 +599,7 @@ static void set_rgb_limited_range_adjustment(
calculate_adjustments(ideals, &adjustments, matrix);
- dm_memmove(change_matrix, matrix, sizeof(matrix));
+ memmove(change_matrix, matrix, sizeof(matrix));
/* from 1 -> 3 */
matrix[8] = change_matrix[0];
diff --git a/drivers/gpu/drm/amd/dal/dc/dm_services.h b/drivers/gpu/drm/amd/dal/dc/dm_services.h
index 2d33187..8f1bb5c 100644
--- a/drivers/gpu/drm/amd/dal/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/dal/dc/dm_services.h
@@ -44,8 +44,6 @@
#define dm_realloc(ptr, size) krealloc(ptr, size, GFP_KERNEL)
#define dm_free(ptr) kfree(ptr)
-void dm_memmove(void *dst, const void *src, uint32_t size);
-
int32_t dm_memcmp(const void *p1, const void *p2, uint32_t count);
int32_t dm_strncmp(const char *p1, const char *p2, uint32_t count);
--
2.7.4
|
