diff options
author | Sean Paul | 2016-02-03 09:52:15 -0600 |
---|---|---|
committer | Sean Paul | 2016-02-03 09:52:15 -0600 |
commit | 870942e56aac024da5e0a621275f6561a4ddab1b (patch) | |
tree | f50e065f5088a40e2a34ae83e2e3ff6ab2e6f625 /tegra | |
parent | bd4d0d244019a72be9ca51ac3e8f35201b271f1b (diff) | |
parent | b38a4b2326c1be5702f5cb73a53c0ed74c12d510 (diff) | |
download | external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.gz external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.xz external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.zip |
Merge tag 'tags/libdrm-2.4.66' into master
Tag libdrm-2.4.66 from git://anongit.freedesktop.org/mesa/drm
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Conflicts:
Android.mk
Makefile.am
configure.ac
freedreno/Android.mk
include/drm/drm_mode.h
intel/Android.mk
libkms/Android.mk
nouveau/Android.mk
radeon/Android.mk
tegra/tegra.c
tests/Makefile.am
xf86drmMode.c
xf86drmMode.h
Change-Id: I3186bde7f196d2f3438c4334591ee2a0c1371c96
Diffstat (limited to 'tegra')
-rw-r--r-- | tegra/Makefile.am | 4 | ||||
-rw-r--r-- | tegra/private.h | 2 | ||||
-rwxr-xr-x | tegra/tegra-symbol-check | 30 | ||||
-rw-r--r-- | tegra/tegra.c | 15 |
4 files changed, 34 insertions, 17 deletions
diff --git a/tegra/Makefile.am b/tegra/Makefile.am index a6474879..fb40be55 100644 --- a/tegra/Makefile.am +++ b/tegra/Makefile.am | |||
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \ | |||
4 | 4 | ||
5 | AM_CFLAGS = \ | 5 | AM_CFLAGS = \ |
6 | @PTHREADSTUBS_CFLAGS@ \ | 6 | @PTHREADSTUBS_CFLAGS@ \ |
7 | $(VISIBILITY_CFLAGS) \ | ||
8 | $(WARN_CFLAGS) | 7 | $(WARN_CFLAGS) |
9 | 8 | ||
10 | libdrm_tegra_ladir = $(libdir) | 9 | libdrm_tegra_ladir = $(libdir) |
@@ -21,3 +20,6 @@ libdrm_tegrainclude_HEADERS = tegra.h | |||
21 | 20 | ||
22 | pkgconfigdir = @pkgconfigdir@ | 21 | pkgconfigdir = @pkgconfigdir@ |
23 | pkgconfig_DATA = libdrm_tegra.pc | 22 | pkgconfig_DATA = libdrm_tegra.pc |
23 | |||
24 | TESTS = tegra-symbol-check | ||
25 | EXTRA_DIST = $(TESTS) | ||
diff --git a/tegra/private.h b/tegra/private.h index 1b490d40..571caa56 100644 --- a/tegra/private.h +++ b/tegra/private.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <stdbool.h> | 28 | #include <stdbool.h> |
29 | #include <stdint.h> | 29 | #include <stdint.h> |
30 | 30 | ||
31 | #include <libdrm.h> | 31 | #include <libdrm_macros.h> |
32 | #include <xf86atomic.h> | 32 | #include <xf86atomic.h> |
33 | 33 | ||
34 | #include "tegra.h" | 34 | #include "tegra.h" |
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check new file mode 100755 index 00000000..40208311 --- /dev/null +++ b/tegra/tegra-symbol-check | |||
@@ -0,0 +1,30 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | # The following symbols (past the first five) are taken from the public headers. | ||
4 | # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES | ||
5 | |||
6 | FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do | ||
7 | ( grep -q "^$func$" || echo $func ) <<EOF | ||
8 | __bss_start | ||
9 | _edata | ||
10 | _end | ||
11 | _fini | ||
12 | _init | ||
13 | drm_tegra_bo_get_flags | ||
14 | drm_tegra_bo_get_handle | ||
15 | drm_tegra_bo_get_tiling | ||
16 | drm_tegra_bo_map | ||
17 | drm_tegra_bo_new | ||
18 | drm_tegra_bo_ref | ||
19 | drm_tegra_bo_set_flags | ||
20 | drm_tegra_bo_set_tiling | ||
21 | drm_tegra_bo_unmap | ||
22 | drm_tegra_bo_unref | ||
23 | drm_tegra_bo_wrap | ||
24 | drm_tegra_close | ||
25 | drm_tegra_new | ||
26 | EOF | ||
27 | done) | ||
28 | |||
29 | test ! -n "$FUNCS" || echo $FUNCS | ||
30 | test ! -n "$FUNCS" | ||
diff --git a/tegra/tegra.c b/tegra/tegra.c index a58a08a5..66f19e96 100644 --- a/tegra/tegra.c +++ b/tegra/tegra.c | |||
@@ -74,7 +74,6 @@ static int drm_tegra_wrap(struct drm_tegra **drmp, int fd, bool close) | |||
74 | return 0; | 74 | return 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | drm_public | ||
78 | int drm_tegra_new(struct drm_tegra **drmp, int fd) | 77 | int drm_tegra_new(struct drm_tegra **drmp, int fd) |
79 | { | 78 | { |
80 | bool supported = false; | 79 | bool supported = false; |
@@ -95,7 +94,6 @@ int drm_tegra_new(struct drm_tegra **drmp, int fd) | |||
95 | return drm_tegra_wrap(drmp, fd, false); | 94 | return drm_tegra_wrap(drmp, fd, false); |
96 | } | 95 | } |
97 | 96 | ||
98 | drm_public | ||
99 | void drm_tegra_close(struct drm_tegra *drm) | 97 | void drm_tegra_close(struct drm_tegra *drm) |
100 | { | 98 | { |
101 | if (!drm) | 99 | if (!drm) |
@@ -107,7 +105,6 @@ void drm_tegra_close(struct drm_tegra *drm) | |||
107 | free(drm); | 105 | free(drm); |
108 | } | 106 | } |
109 | 107 | ||
110 | drm_public | ||
111 | int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm, | 108 | int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm, |
112 | uint32_t flags, uint32_t size) | 109 | uint32_t flags, uint32_t size) |
113 | { | 110 | { |
@@ -146,7 +143,6 @@ int drm_tegra_bo_new(struct drm_tegra_bo **bop, struct drm_tegra *drm, | |||
146 | return 0; | 143 | return 0; |
147 | } | 144 | } |
148 | 145 | ||
149 | drm_public | ||
150 | int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm, | 146 | int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm, |
151 | uint32_t handle, uint32_t flags, uint32_t size) | 147 | uint32_t handle, uint32_t flags, uint32_t size) |
152 | { | 148 | { |
@@ -170,7 +166,6 @@ int drm_tegra_bo_wrap(struct drm_tegra_bo **bop, struct drm_tegra *drm, | |||
170 | return 0; | 166 | return 0; |
171 | } | 167 | } |
172 | 168 | ||
173 | drm_public | ||
174 | int drm_tegra_bo_name_ref(struct drm_tegra *drm, uint32_t name, uint32_t size, | 169 | int drm_tegra_bo_name_ref(struct drm_tegra *drm, uint32_t name, uint32_t size, |
175 | struct drm_tegra_bo **bop) | 170 | struct drm_tegra_bo **bop) |
176 | { | 171 | { |
@@ -203,7 +198,6 @@ err: | |||
203 | return ret; | 198 | return ret; |
204 | } | 199 | } |
205 | 200 | ||
206 | drm_public | ||
207 | int drm_tegra_bo_name_get(struct drm_tegra_bo *bo, uint32_t *name) | 201 | int drm_tegra_bo_name_get(struct drm_tegra_bo *bo, uint32_t *name) |
208 | { | 202 | { |
209 | struct drm_gem_flink args; | 203 | struct drm_gem_flink args; |
@@ -227,7 +221,6 @@ int drm_tegra_bo_name_get(struct drm_tegra_bo *bo, uint32_t *name) | |||
227 | return 0; | 221 | return 0; |
228 | } | 222 | } |
229 | 223 | ||
230 | drm_public | ||
231 | struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo) | 224 | struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo) |
232 | { | 225 | { |
233 | if (bo) | 226 | if (bo) |
@@ -236,14 +229,12 @@ struct drm_tegra_bo *drm_tegra_bo_ref(struct drm_tegra_bo *bo) | |||
236 | return bo; | 229 | return bo; |
237 | } | 230 | } |
238 | 231 | ||
239 | drm_public | ||
240 | void drm_tegra_bo_unref(struct drm_tegra_bo *bo) | 232 | void drm_tegra_bo_unref(struct drm_tegra_bo *bo) |
241 | { | 233 | { |
242 | if (bo && atomic_dec_and_test(&bo->ref)) | 234 | if (bo && atomic_dec_and_test(&bo->ref)) |
243 | drm_tegra_bo_free(bo); | 235 | drm_tegra_bo_free(bo); |
244 | } | 236 | } |
245 | 237 | ||
246 | drm_public | ||
247 | int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle) | 238 | int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle) |
248 | { | 239 | { |
249 | if (!bo || !handle) | 240 | if (!bo || !handle) |
@@ -254,7 +245,6 @@ int drm_tegra_bo_get_handle(struct drm_tegra_bo *bo, uint32_t *handle) | |||
254 | return 0; | 245 | return 0; |
255 | } | 246 | } |
256 | 247 | ||
257 | drm_public | ||
258 | int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr) | 248 | int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr) |
259 | { | 249 | { |
260 | struct drm_tegra *drm = bo->drm; | 250 | struct drm_tegra *drm = bo->drm; |
@@ -287,7 +277,6 @@ int drm_tegra_bo_map(struct drm_tegra_bo *bo, void **ptr) | |||
287 | return 0; | 277 | return 0; |
288 | } | 278 | } |
289 | 279 | ||
290 | drm_public | ||
291 | int drm_tegra_bo_unmap(struct drm_tegra_bo *bo) | 280 | int drm_tegra_bo_unmap(struct drm_tegra_bo *bo) |
292 | { | 281 | { |
293 | if (!bo) | 282 | if (!bo) |
@@ -304,7 +293,6 @@ int drm_tegra_bo_unmap(struct drm_tegra_bo *bo) | |||
304 | return 0; | 293 | return 0; |
305 | } | 294 | } |
306 | 295 | ||
307 | drm_public | ||
308 | int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags) | 296 | int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags) |
309 | { | 297 | { |
310 | struct drm_tegra_gem_get_flags args; | 298 | struct drm_tegra_gem_get_flags args; |
@@ -328,7 +316,6 @@ int drm_tegra_bo_get_flags(struct drm_tegra_bo *bo, uint32_t *flags) | |||
328 | return 0; | 316 | return 0; |
329 | } | 317 | } |
330 | 318 | ||
331 | drm_public | ||
332 | int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags) | 319 | int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags) |
333 | { | 320 | { |
334 | struct drm_tegra_gem_get_flags args; | 321 | struct drm_tegra_gem_get_flags args; |
@@ -350,7 +337,6 @@ int drm_tegra_bo_set_flags(struct drm_tegra_bo *bo, uint32_t flags) | |||
350 | return 0; | 337 | return 0; |
351 | } | 338 | } |
352 | 339 | ||
353 | drm_public | ||
354 | int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo, | 340 | int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo, |
355 | struct drm_tegra_bo_tiling *tiling) | 341 | struct drm_tegra_bo_tiling *tiling) |
356 | { | 342 | { |
@@ -377,7 +363,6 @@ int drm_tegra_bo_get_tiling(struct drm_tegra_bo *bo, | |||
377 | return 0; | 363 | return 0; |
378 | } | 364 | } |
379 | 365 | ||
380 | drm_public | ||
381 | int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo, | 366 | int drm_tegra_bo_set_tiling(struct drm_tegra_bo *bo, |
382 | const struct drm_tegra_bo_tiling *tiling) | 367 | const struct drm_tegra_bo_tiling *tiling) |
383 | { | 368 | { |