aboutsummaryrefslogtreecommitdiffstats
path: root/exynos
diff options
context:
space:
mode:
authorMaarten Lankhorst2014-08-04 04:23:52 -0500
committerMaarten Lankhorst2014-08-14 14:59:20 -0500
commitd9ce09de12131fa8c5ff2d7c2dbd6b61d8a5fd14 (patch)
tree494f0aaa8b3465ee7107666df15cc2b1b3ee699c /exynos
parent479b6cef702f26d886b3f6ccfd48d5e39a623944 (diff)
downloadexternal-libdrm-d9ce09de12131fa8c5ff2d7c2dbd6b61d8a5fd14.tar.gz
external-libdrm-d9ce09de12131fa8c5ff2d7c2dbd6b61d8a5fd14.tar.xz
external-libdrm-d9ce09de12131fa8c5ff2d7c2dbd6b61d8a5fd14.zip
exynos: Use symbol visibility.
No changes to exported symbols. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'exynos')
-rw-r--r--exynos/Makefile.am1
-rw-r--r--exynos/exynos_drm.c37
-rw-r--r--exynos/exynos_fimg2d.c19
3 files changed, 33 insertions, 24 deletions
diff --git a/exynos/Makefile.am b/exynos/Makefile.am
index 0a2663ac..06bee007 100644
--- a/exynos/Makefile.am
+++ b/exynos/Makefile.am
@@ -1,5 +1,6 @@
1AM_CFLAGS = \ 1AM_CFLAGS = \
2 $(WARN_CFLAGS) \ 2 $(WARN_CFLAGS) \
3 $(VISIBILITY_CFLAGS) \
3 -I$(top_srcdir) \ 4 -I$(top_srcdir) \
4 -I$(top_srcdir)/exynos \ 5 -I$(top_srcdir)/exynos \
5 $(PTHREADSTUBS_CFLAGS) \ 6 $(PTHREADSTUBS_CFLAGS) \
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index 5fff2597..4c7dd13e 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -38,6 +38,7 @@
38 38
39#include <xf86drm.h> 39#include <xf86drm.h>
40 40
41#include "libdrm.h"
41#include "exynos_drm.h" 42#include "exynos_drm.h"
42#include "exynos_drmif.h" 43#include "exynos_drmif.h"
43 44
@@ -48,7 +49,7 @@
48 * 49 *
49 * if true, return the device object else NULL. 50 * if true, return the device object else NULL.
50 */ 51 */
51struct exynos_device * exynos_device_create(int fd) 52drm_public struct exynos_device * exynos_device_create(int fd)
52{ 53{
53 struct exynos_device *dev; 54 struct exynos_device *dev;
54 55
@@ -69,7 +70,7 @@ struct exynos_device * exynos_device_create(int fd)
69 * 70 *
70 * @dev: exynos drm device object. 71 * @dev: exynos drm device object.
71 */ 72 */
72void exynos_device_destroy(struct exynos_device *dev) 73drm_public void exynos_device_destroy(struct exynos_device *dev)
73{ 74{
74 free(dev); 75 free(dev);
75} 76}
@@ -87,8 +88,8 @@ void exynos_device_destroy(struct exynos_device *dev)
87 * 88 *
88 * if true, return a exynos buffer object else NULL. 89 * if true, return a exynos buffer object else NULL.
89 */ 90 */
90struct exynos_bo * exynos_bo_create(struct exynos_device *dev, 91drm_public struct exynos_bo * exynos_bo_create(struct exynos_device *dev,
91 size_t size, uint32_t flags) 92 size_t size, uint32_t flags)
92{ 93{
93 struct exynos_bo *bo; 94 struct exynos_bo *bo;
94 struct drm_exynos_gem_create req = { 95 struct drm_exynos_gem_create req = {
@@ -141,8 +142,8 @@ fail:
141 * 142 *
142 * if true, return 0 else negative. 143 * if true, return 0 else negative.
143 */ 144 */
144int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle, 145drm_public int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle,
145 size_t *size, uint32_t *flags) 146 size_t *size, uint32_t *flags)
146{ 147{
147 int ret; 148 int ret;
148 struct drm_exynos_gem_info req = { 149 struct drm_exynos_gem_info req = {
@@ -167,7 +168,7 @@ int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle,
167 * 168 *
168 * @bo: a exynos buffer object to be destroyed. 169 * @bo: a exynos buffer object to be destroyed.
169 */ 170 */
170void exynos_bo_destroy(struct exynos_bo *bo) 171drm_public void exynos_bo_destroy(struct exynos_bo *bo)
171{ 172{
172 if (!bo) 173 if (!bo)
173 return; 174 return;
@@ -199,7 +200,8 @@ void exynos_bo_destroy(struct exynos_bo *bo)
199 * if true, return a exynos buffer object else NULL. 200 * if true, return a exynos buffer object else NULL.
200 * 201 *
201 */ 202 */
202struct exynos_bo * exynos_bo_from_name(struct exynos_device *dev, uint32_t name) 203drm_public struct exynos_bo *
204exynos_bo_from_name(struct exynos_device *dev, uint32_t name)
203{ 205{
204 struct exynos_bo *bo; 206 struct exynos_bo *bo;
205 struct drm_gem_open req = { 207 struct drm_gem_open req = {
@@ -241,7 +243,7 @@ err_free_bo:
241 * 243 *
242 * if true, return 0 else negative. 244 * if true, return 0 else negative.
243 */ 245 */
244int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name) 246drm_public int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name)
245{ 247{
246 if (!bo->name) { 248 if (!bo->name) {
247 struct drm_gem_flink req = { 249 struct drm_gem_flink req = {
@@ -264,7 +266,7 @@ int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name)
264 return 0; 266 return 0;
265} 267}
266 268
267uint32_t exynos_bo_handle(struct exynos_bo *bo) 269drm_public uint32_t exynos_bo_handle(struct exynos_bo *bo)
268{ 270{
269 return bo->handle; 271 return bo->handle;
270} 272}
@@ -277,7 +279,7 @@ uint32_t exynos_bo_handle(struct exynos_bo *bo)
277 * 279 *
278 * if true, user pointer mmaped else NULL. 280 * if true, user pointer mmaped else NULL.
279 */ 281 */
280void *exynos_bo_map(struct exynos_bo *bo) 282drm_public void *exynos_bo_map(struct exynos_bo *bo)
281{ 283{
282 if (!bo->vaddr) { 284 if (!bo->vaddr) {
283 struct exynos_device *dev = bo->dev; 285 struct exynos_device *dev = bo->dev;
@@ -309,8 +311,8 @@ void *exynos_bo_map(struct exynos_bo *bo)
309 * 311 *
310 * @return: 0 on success, -1 on error, and errno will be set 312 * @return: 0 on success, -1 on error, and errno will be set
311 */ 313 */
312int exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, 314drm_public int
313 int *fd) 315exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd)
314{ 316{
315 return drmPrimeHandleToFD(dev->fd, handle, 0, fd); 317 return drmPrimeHandleToFD(dev->fd, handle, 0, fd);
316} 318}
@@ -324,8 +326,8 @@ int exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle,
324 * 326 *
325 * @return: 0 on success, -1 on error, and errno will be set 327 * @return: 0 on success, -1 on error, and errno will be set
326 */ 328 */
327int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, 329drm_public int
328 uint32_t *handle) 330exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle)
329{ 331{
330 return drmPrimeFDToHandle(dev->fd, fd, handle); 332 return drmPrimeFDToHandle(dev->fd, fd, handle);
331} 333}
@@ -347,8 +349,9 @@ int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd,
347 * 349 *
348 * if true, return 0 else negative. 350 * if true, return 0 else negative.
349 */ 351 */
350int exynos_vidi_connection(struct exynos_device *dev, uint32_t connect, 352drm_public int
351 uint32_t ext, void *edid) 353exynos_vidi_connection(struct exynos_device *dev, uint32_t connect,
354 uint32_t ext, void *edid)
352{ 355{
353 struct drm_exynos_vidi_connection req = { 356 struct drm_exynos_vidi_connection req = {
354 .connection = connect, 357 .connection = connect,
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index fc281b6e..ce1ba1ef 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -24,6 +24,7 @@
24 24
25#include <xf86drm.h> 25#include <xf86drm.h>
26 26
27#include "libdrm.h"
27#include "exynos_drm.h" 28#include "exynos_drm.h"
28#include "fimg2d_reg.h" 29#include "fimg2d_reg.h"
29#include "fimg2d.h" 30#include "fimg2d.h"
@@ -184,7 +185,7 @@ static int g2d_flush(struct g2d_context *ctx)
184 * 185 *
185 * fd: a file descriptor to drm device driver opened. 186 * fd: a file descriptor to drm device driver opened.
186 */ 187 */
187struct g2d_context *g2d_init(int fd) 188drm_public struct g2d_context *g2d_init(int fd)
188{ 189{
189 struct drm_exynos_g2d_get_ver ver; 190 struct drm_exynos_g2d_get_ver ver;
190 struct g2d_context *ctx; 191 struct g2d_context *ctx;
@@ -212,7 +213,7 @@ struct g2d_context *g2d_init(int fd)
212 return ctx; 213 return ctx;
213} 214}
214 215
215void g2d_fini(struct g2d_context *ctx) 216drm_public void g2d_fini(struct g2d_context *ctx)
216{ 217{
217 if (ctx) 218 if (ctx)
218 free(ctx); 219 free(ctx);
@@ -223,7 +224,7 @@ void g2d_fini(struct g2d_context *ctx)
223 * 224 *
224 * @ctx: a pointer to g2d_context structure. 225 * @ctx: a pointer to g2d_context structure.
225 */ 226 */
226int g2d_exec(struct g2d_context *ctx) 227drm_public int g2d_exec(struct g2d_context *ctx)
227{ 228{
228 struct drm_exynos_g2d_exec exec; 229 struct drm_exynos_g2d_exec exec;
229 int ret; 230 int ret;
@@ -255,7 +256,8 @@ int g2d_exec(struct g2d_context *ctx)
255 * @w: width value to buffer filled with given color data. 256 * @w: width value to buffer filled with given color data.
256 * @h: height value to buffer filled with given color data. 257 * @h: height value to buffer filled with given color data.
257 */ 258 */
258int g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img, 259drm_public int
260g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img,
259 unsigned int x, unsigned int y, unsigned int w, 261 unsigned int x, unsigned int y, unsigned int w,
260 unsigned int h) 262 unsigned int h)
261{ 263{
@@ -315,7 +317,8 @@ int g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img,
315 * @w: width value to source and destination buffers. 317 * @w: width value to source and destination buffers.
316 * @h: height value to source and destination buffers. 318 * @h: height value to source and destination buffers.
317 */ 319 */
318int g2d_copy(struct g2d_context *ctx, struct g2d_image *src, 320drm_public int
321g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
319 struct g2d_image *dst, unsigned int src_x, unsigned int src_y, 322 struct g2d_image *dst, unsigned int src_x, unsigned int src_y,
320 unsigned int dst_x, unsigned dst_y, unsigned int w, 323 unsigned int dst_x, unsigned dst_y, unsigned int w,
321 unsigned int h) 324 unsigned int h)
@@ -414,7 +417,8 @@ int g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
414 * @negative: indicate that it uses color negative to source and 417 * @negative: indicate that it uses color negative to source and
415 * destination buffers. 418 * destination buffers.
416 */ 419 */
417int g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src, 420drm_public int
421g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
418 struct g2d_image *dst, unsigned int src_x, 422 struct g2d_image *dst, unsigned int src_x,
419 unsigned int src_y, unsigned int src_w, 423 unsigned int src_y, unsigned int src_w,
420 unsigned int src_h, unsigned int dst_x, 424 unsigned int src_h, unsigned int dst_x,
@@ -526,7 +530,8 @@ int g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
526 * @h: height value to source and destination buffer. 530 * @h: height value to source and destination buffer.
527 * @op: blend operation type. 531 * @op: blend operation type.
528 */ 532 */
529int g2d_blend(struct g2d_context *ctx, struct g2d_image *src, 533drm_public int
534g2d_blend(struct g2d_context *ctx, struct g2d_image *src,
530 struct g2d_image *dst, unsigned int src_x, 535 struct g2d_image *dst, unsigned int src_x,
531 unsigned int src_y, unsigned int dst_x, unsigned int dst_y, 536 unsigned int src_y, unsigned int dst_x, unsigned int dst_y,
532 unsigned int w, unsigned int h, enum e_g2d_op op) 537 unsigned int w, unsigned int h, enum e_g2d_op op)