aboutsummaryrefslogtreecommitdiffstats
path: root/exynos
diff options
context:
space:
mode:
authorEmil Velikov2015-03-31 16:32:11 -0500
committerEmil Velikov2015-04-28 05:19:15 -0500
commit0f8da82500ec542e269092c0718479e25eaff5f6 (patch)
tree4bfdf0fe56674bd42926f6f4607331d1468d08dd /exynos
parent104c895f650cac7741c12e10ee78bb2fca2cbd49 (diff)
downloadexternal-libgbm-0f8da82500ec542e269092c0718479e25eaff5f6.tar.gz
external-libgbm-0f8da82500ec542e269092c0718479e25eaff5f6.tar.xz
external-libgbm-0f8da82500ec542e269092c0718479e25eaff5f6.zip
drm: remove drm_public macro
Some compilers (like the Oracle Studio), require that the function declaration must be annotated with the same visibility attribute as the definition. As annotating functions with drm_public is no longer required just remove the macro. Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Michel Dänzer <michel.daenzer@amd.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Thierry Reding <treding@nvidia.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'exynos')
-rw-r--r--exynos/exynos_drm.c24
-rw-r--r--exynos/exynos_fimg2d.c16
2 files changed, 20 insertions, 20 deletions
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index 5d07ea7b..df9b8ed4 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -49,7 +49,7 @@
49 * 49 *
50 * if true, return the device object else NULL. 50 * if true, return the device object else NULL.
51 */ 51 */
52drm_public struct exynos_device * exynos_device_create(int fd) 52struct exynos_device * exynos_device_create(int fd)
53{ 53{
54 struct exynos_device *dev; 54 struct exynos_device *dev;
55 55
@@ -70,7 +70,7 @@ drm_public struct exynos_device * exynos_device_create(int fd)
70 * 70 *
71 * @dev: exynos drm device object. 71 * @dev: exynos drm device object.
72 */ 72 */
73drm_public void exynos_device_destroy(struct exynos_device *dev) 73void exynos_device_destroy(struct exynos_device *dev)
74{ 74{
75 free(dev); 75 free(dev);
76} 76}
@@ -88,7 +88,7 @@ drm_public void exynos_device_destroy(struct exynos_device *dev)
88 * 88 *
89 * if true, return a exynos buffer object else NULL. 89 * if true, return a exynos buffer object else NULL.
90 */ 90 */
91drm_public struct exynos_bo * exynos_bo_create(struct exynos_device *dev, 91struct exynos_bo * exynos_bo_create(struct exynos_device *dev,
92 size_t size, uint32_t flags) 92 size_t size, uint32_t flags)
93{ 93{
94 struct exynos_bo *bo; 94 struct exynos_bo *bo;
@@ -142,7 +142,7 @@ fail:
142 * 142 *
143 * if true, return 0 else negative. 143 * if true, return 0 else negative.
144 */ 144 */
145drm_public int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle, 145int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle,
146 size_t *size, uint32_t *flags) 146 size_t *size, uint32_t *flags)
147{ 147{
148 int ret; 148 int ret;
@@ -168,7 +168,7 @@ drm_public int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle,
168 * 168 *
169 * @bo: a exynos buffer object to be destroyed. 169 * @bo: a exynos buffer object to be destroyed.
170 */ 170 */
171drm_public void exynos_bo_destroy(struct exynos_bo *bo) 171void exynos_bo_destroy(struct exynos_bo *bo)
172{ 172{
173 if (!bo) 173 if (!bo)
174 return; 174 return;
@@ -200,7 +200,7 @@ drm_public void exynos_bo_destroy(struct exynos_bo *bo)
200 * if true, return a exynos buffer object else NULL. 200 * if true, return a exynos buffer object else NULL.
201 * 201 *
202 */ 202 */
203drm_public struct exynos_bo * 203struct exynos_bo *
204exynos_bo_from_name(struct exynos_device *dev, uint32_t name) 204exynos_bo_from_name(struct exynos_device *dev, uint32_t name)
205{ 205{
206 struct exynos_bo *bo; 206 struct exynos_bo *bo;
@@ -243,7 +243,7 @@ err_free_bo:
243 * 243 *
244 * if true, return 0 else negative. 244 * if true, return 0 else negative.
245 */ 245 */
246drm_public int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name) 246int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name)
247{ 247{
248 if (!bo->name) { 248 if (!bo->name) {
249 struct drm_gem_flink req = { 249 struct drm_gem_flink req = {
@@ -266,7 +266,7 @@ drm_public int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name)
266 return 0; 266 return 0;
267} 267}
268 268
269drm_public uint32_t exynos_bo_handle(struct exynos_bo *bo) 269uint32_t exynos_bo_handle(struct exynos_bo *bo)
270{ 270{
271 return bo->handle; 271 return bo->handle;
272} 272}
@@ -279,7 +279,7 @@ drm_public uint32_t exynos_bo_handle(struct exynos_bo *bo)
279 * 279 *
280 * if true, user pointer mmaped else NULL. 280 * if true, user pointer mmaped else NULL.
281 */ 281 */
282drm_public void *exynos_bo_map(struct exynos_bo *bo) 282void *exynos_bo_map(struct exynos_bo *bo)
283{ 283{
284 if (!bo->vaddr) { 284 if (!bo->vaddr) {
285 struct exynos_device *dev = bo->dev; 285 struct exynos_device *dev = bo->dev;
@@ -316,7 +316,7 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo)
316 * 316 *
317 * @return: 0 on success, -1 on error, and errno will be set 317 * @return: 0 on success, -1 on error, and errno will be set
318 */ 318 */
319drm_public int 319int
320exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd) 320exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd)
321{ 321{
322 return drmPrimeHandleToFD(dev->fd, handle, 0, fd); 322 return drmPrimeHandleToFD(dev->fd, handle, 0, fd);
@@ -331,7 +331,7 @@ exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd)
331 * 331 *
332 * @return: 0 on success, -1 on error, and errno will be set 332 * @return: 0 on success, -1 on error, and errno will be set
333 */ 333 */
334drm_public int 334int
335exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle) 335exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle)
336{ 336{
337 return drmPrimeFDToHandle(dev->fd, fd, handle); 337 return drmPrimeFDToHandle(dev->fd, fd, handle);
@@ -354,7 +354,7 @@ exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle)
354 * 354 *
355 * if true, return 0 else negative. 355 * if true, return 0 else negative.
356 */ 356 */
357drm_public int 357int
358exynos_vidi_connection(struct exynos_device *dev, uint32_t connect, 358exynos_vidi_connection(struct exynos_device *dev, uint32_t connect,
359 uint32_t ext, void *edid) 359 uint32_t ext, void *edid)
360{ 360{
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index cb422e8a..86ae8989 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -224,7 +224,7 @@ static int g2d_flush(struct g2d_context *ctx)
224 * 224 *
225 * fd: a file descriptor to an opened drm device. 225 * fd: a file descriptor to an opened drm device.
226 */ 226 */
227drm_public struct g2d_context *g2d_init(int fd) 227struct g2d_context *g2d_init(int fd)
228{ 228{
229 struct drm_exynos_g2d_get_ver ver; 229 struct drm_exynos_g2d_get_ver ver;
230 struct g2d_context *ctx; 230 struct g2d_context *ctx;
@@ -252,7 +252,7 @@ drm_public struct g2d_context *g2d_init(int fd)
252 return ctx; 252 return ctx;
253} 253}
254 254
255drm_public void g2d_fini(struct g2d_context *ctx) 255void g2d_fini(struct g2d_context *ctx)
256{ 256{
257 if (ctx) 257 if (ctx)
258 free(ctx); 258 free(ctx);
@@ -263,7 +263,7 @@ drm_public void g2d_fini(struct g2d_context *ctx)
263 * 263 *
264 * @ctx: a pointer to g2d_context structure. 264 * @ctx: a pointer to g2d_context structure.
265 */ 265 */
266drm_public int g2d_exec(struct g2d_context *ctx) 266int g2d_exec(struct g2d_context *ctx)
267{ 267{
268 struct drm_exynos_g2d_exec exec; 268 struct drm_exynos_g2d_exec exec;
269 int ret; 269 int ret;
@@ -295,7 +295,7 @@ drm_public int g2d_exec(struct g2d_context *ctx)
295 * @w: width value to buffer filled with given color data. 295 * @w: width value to buffer filled with given color data.
296 * @h: height value to buffer filled with given color data. 296 * @h: height value to buffer filled with given color data.
297 */ 297 */
298drm_public int 298int
299g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img, 299g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img,
300 unsigned int x, unsigned int y, unsigned int w, 300 unsigned int x, unsigned int y, unsigned int w,
301 unsigned int h) 301 unsigned int h)
@@ -350,7 +350,7 @@ g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img,
350 * @w: width value to source and destination buffers. 350 * @w: width value to source and destination buffers.
351 * @h: height value to source and destination buffers. 351 * @h: height value to source and destination buffers.
352 */ 352 */
353drm_public int 353int
354g2d_copy(struct g2d_context *ctx, struct g2d_image *src, 354g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
355 struct g2d_image *dst, unsigned int src_x, unsigned int src_y, 355 struct g2d_image *dst, unsigned int src_x, unsigned int src_y,
356 unsigned int dst_x, unsigned dst_y, unsigned int w, 356 unsigned int dst_x, unsigned dst_y, unsigned int w,
@@ -440,7 +440,7 @@ g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
440 * @negative: indicate that it uses color negative to source and 440 * @negative: indicate that it uses color negative to source and
441 * destination buffers. 441 * destination buffers.
442 */ 442 */
443drm_public int 443int
444g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src, 444g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
445 struct g2d_image *dst, unsigned int src_x, 445 struct g2d_image *dst, unsigned int src_x,
446 unsigned int src_y, unsigned int src_w, 446 unsigned int src_y, unsigned int src_w,
@@ -548,7 +548,7 @@ g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
548 * @h: height value to source and destination buffer. 548 * @h: height value to source and destination buffer.
549 * @op: blend operation type. 549 * @op: blend operation type.
550 */ 550 */
551drm_public int 551int
552g2d_blend(struct g2d_context *ctx, struct g2d_image *src, 552g2d_blend(struct g2d_context *ctx, struct g2d_image *src,
553 struct g2d_image *dst, unsigned int src_x, 553 struct g2d_image *dst, unsigned int src_x,
554 unsigned int src_y, unsigned int dst_x, unsigned int dst_y, 554 unsigned int src_y, unsigned int dst_x, unsigned int dst_y,
@@ -659,7 +659,7 @@ g2d_blend(struct g2d_context *ctx, struct g2d_image *src,
659 * @dst_h: height value to destination buffer. 659 * @dst_h: height value to destination buffer.
660 * @op: blend operation type. 660 * @op: blend operation type.
661 */ 661 */
662drm_public int 662int
663g2d_scale_and_blend(struct g2d_context *ctx, struct g2d_image *src, 663g2d_scale_and_blend(struct g2d_context *ctx, struct g2d_image *src,
664 struct g2d_image *dst, unsigned int src_x, unsigned int src_y, 664 struct g2d_image *dst, unsigned int src_x, unsigned int src_y,
665 unsigned int src_w, unsigned int src_h, unsigned int dst_x, 665 unsigned int src_w, unsigned int src_h, unsigned int dst_x,