geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exynos: Use symbol visibility. 

No changes to exported symbols.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
main
Maarten Lankhorst 2014-08-04 11:23:52 +02:00 committed by Maarten Lankhorst
parent 479b6cef70
commit d9ce09de12
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exynos/Makefile.am
View File

@ -1,5 +1,6 @@
AM_CFLAGS = \ AM_CFLAGS = \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(VISIBILITY_CFLAGS) \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/exynos \ -I$(top_srcdir)/exynos \
$(PTHREADSTUBS_CFLAGS) \ $(PTHREADSTUBS_CFLAGS) \

37
exynos/exynos_drm.c
View File

@ -38,6 +38,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include "libdrm.h"
#include "exynos_drm.h" #include "exynos_drm.h"
#include "exynos_drmif.h" #include "exynos_drmif.h"
@ -48,7 +49,7 @@
* *
* if true, return the device object else NULL. * if true, return the device object else NULL.
*/ */
struct exynos_device * exynos_device_create(int fd) drm_public struct exynos_device * exynos_device_create(int fd)
{ {
struct exynos_device *dev; struct exynos_device *dev;
@ -69,7 +70,7 @@ struct exynos_device * exynos_device_create(int fd)
* *
* @dev: exynos drm device object. * @dev: exynos drm device object.
*/ */
void exynos_device_destroy(struct exynos_device *dev) drm_public void exynos_device_destroy(struct exynos_device *dev)
{ {
free(dev); free(dev);
} }
@ -87,8 +88,8 @@ void exynos_device_destroy(struct exynos_device *dev)
* *
* if true, return a exynos buffer object else NULL. * if true, return a exynos buffer object else NULL.
*/ */
struct exynos_bo * exynos_bo_create(struct exynos_device *dev, drm_public struct exynos_bo * exynos_bo_create(struct exynos_device *dev,
size_t size, uint32_t flags) size_t size, uint32_t flags)
{ {
struct exynos_bo *bo; struct exynos_bo *bo;
struct drm_exynos_gem_create req = { struct drm_exynos_gem_create req = {
@ -141,8 +142,8 @@ fail:
* *
* if true, return 0 else negative. * if true, return 0 else negative.
*/ */
int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle, drm_public int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle,
size_t *size, uint32_t *flags) size_t *size, uint32_t *flags)
{ {
int ret; int ret;
struct drm_exynos_gem_info req = { struct drm_exynos_gem_info req = {
@ -167,7 +168,7 @@ int exynos_bo_get_info(struct exynos_device *dev, uint32_t handle,
* *
* @bo: a exynos buffer object to be destroyed. * @bo: a exynos buffer object to be destroyed.
*/ */
void exynos_bo_destroy(struct exynos_bo *bo) drm_public void exynos_bo_destroy(struct exynos_bo *bo)
{ {
if (!bo) if (!bo)
return; return;
@ -199,7 +200,8 @@ void exynos_bo_destroy(struct exynos_bo *bo)
* if true, return a exynos buffer object else NULL. * if true, return a exynos buffer object else NULL.
* *
*/ */
struct exynos_bo * exynos_bo_from_name(struct exynos_device *dev, uint32_t name) drm_public struct exynos_bo *
exynos_bo_from_name(struct exynos_device *dev, uint32_t name)
{ {
struct exynos_bo *bo; struct exynos_bo *bo;
struct drm_gem_open req = { struct drm_gem_open req = {
@ -241,7 +243,7 @@ err_free_bo:
* *
* if true, return 0 else negative. * if true, return 0 else negative.
*/ */
int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name) drm_public int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name)
{ {
if (!bo->name) { if (!bo->name) {
struct drm_gem_flink req = { struct drm_gem_flink req = {
@ -264,7 +266,7 @@ int exynos_bo_get_name(struct exynos_bo *bo, uint32_t *name)
return 0; return 0;
} }
uint32_t exynos_bo_handle(struct exynos_bo *bo) drm_public uint32_t exynos_bo_handle(struct exynos_bo *bo)
{ {
return bo->handle; return bo->handle;
} }
@ -277,7 +279,7 @@ uint32_t exynos_bo_handle(struct exynos_bo *bo)
* *
* if true, user pointer mmaped else NULL. * if true, user pointer mmaped else NULL.
*/ */
void *exynos_bo_map(struct exynos_bo *bo) drm_public void *exynos_bo_map(struct exynos_bo *bo)
{ {
if (!bo->vaddr) { if (!bo->vaddr) {
struct exynos_device *dev = bo->dev; struct exynos_device *dev = bo->dev;
@ -309,8 +311,8 @@ void *exynos_bo_map(struct exynos_bo *bo)
* *
* @return: 0 on success, -1 on error, and errno will be set * @return: 0 on success, -1 on error, and errno will be set
*/ */
int exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, drm_public int
int *fd) exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle, int *fd)
{ {
return drmPrimeHandleToFD(dev->fd, handle, 0, fd); return drmPrimeHandleToFD(dev->fd, handle, 0, fd);
} }
@ -324,8 +326,8 @@ int exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle,
* *
* @return: 0 on success, -1 on error, and errno will be set * @return: 0 on success, -1 on error, and errno will be set
*/ */
int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, drm_public int
uint32_t *handle) exynos_prime_fd_to_handle(struct exynos_device *dev, int fd, uint32_t *handle)
{ {
return drmPrimeFDToHandle(dev->fd, fd, handle); return drmPrimeFDToHandle(dev->fd, fd, handle);
} }
@ -347,8 +349,9 @@ int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd,
* *
* if true, return 0 else negative. * if true, return 0 else negative.
*/ */
int exynos_vidi_connection(struct exynos_device *dev, uint32_t connect, drm_public int
uint32_t ext, void *edid) exynos_vidi_connection(struct exynos_device *dev, uint32_t connect,
uint32_t ext, void *edid)
{ {
struct drm_exynos_vidi_connection req = { struct drm_exynos_vidi_connection req = {
.connection = connect, .connection = connect,

19
exynos/exynos_fimg2d.c
View File

@ -24,6 +24,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include "libdrm.h"
#include "exynos_drm.h" #include "exynos_drm.h"
#include "fimg2d_reg.h" #include "fimg2d_reg.h"
#include "fimg2d.h" #include "fimg2d.h"
@ -184,7 +185,7 @@ static int g2d_flush(struct g2d_context *ctx)
* *
* fd: a file descriptor to drm device driver opened. * fd: a file descriptor to drm device driver opened.
*/ */
struct g2d_context *g2d_init(int fd) drm_public struct g2d_context *g2d_init(int fd)
{ {
struct drm_exynos_g2d_get_ver ver; struct drm_exynos_g2d_get_ver ver;
struct g2d_context *ctx; struct g2d_context *ctx;
@ -212,7 +213,7 @@ struct g2d_context *g2d_init(int fd)
return ctx; return ctx;
} }
void g2d_fini(struct g2d_context *ctx) drm_public void g2d_fini(struct g2d_context *ctx)
{ {
if (ctx) if (ctx)
free(ctx); free(ctx);
@ -223,7 +224,7 @@ void g2d_fini(struct g2d_context *ctx)
* *
* @ctx: a pointer to g2d_context structure. * @ctx: a pointer to g2d_context structure.
*/ */
int g2d_exec(struct g2d_context *ctx) drm_public int g2d_exec(struct g2d_context *ctx)
{ {
struct drm_exynos_g2d_exec exec; struct drm_exynos_g2d_exec exec;
int ret; int ret;
@ -255,7 +256,8 @@ int g2d_exec(struct g2d_context *ctx)
* @w: width value to buffer filled with given color data. * @w: width value to buffer filled with given color data.
* @h: height value to buffer filled with given color data. * @h: height value to buffer filled with given color data.
*/ */
int g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img, drm_public int
g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img,
unsigned int x, unsigned int y, unsigned int w, unsigned int x, unsigned int y, unsigned int w,
unsigned int h) unsigned int h)
{ {
@ -315,7 +317,8 @@ int g2d_solid_fill(struct g2d_context *ctx, struct g2d_image *img,
* @w: width value to source and destination buffers. * @w: width value to source and destination buffers.
* @h: height value to source and destination buffers. * @h: height value to source and destination buffers.
*/ */
int g2d_copy(struct g2d_context *ctx, struct g2d_image *src, drm_public int
g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
struct g2d_image *dst, unsigned int src_x, unsigned int src_y, struct g2d_image *dst, unsigned int src_x, unsigned int src_y,
unsigned int dst_x, unsigned dst_y, unsigned int w, unsigned int dst_x, unsigned dst_y, unsigned int w,
unsigned int h) unsigned int h)
@ -414,7 +417,8 @@ int g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
* @negative: indicate that it uses color negative to source and * @negative: indicate that it uses color negative to source and
* destination buffers. * destination buffers.
*/ */
int g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src, drm_public int
g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
struct g2d_image *dst, unsigned int src_x, struct g2d_image *dst, unsigned int src_x,
unsigned int src_y, unsigned int src_w, unsigned int src_y, unsigned int src_w,
unsigned int src_h, unsigned int dst_x, 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,
* @h: height value to source and destination buffer. * @h: height value to source and destination buffer.
* @op: blend operation type. * @op: blend operation type.
*/ */
int g2d_blend(struct g2d_context *ctx, struct g2d_image *src, drm_public int
g2d_blend(struct g2d_context *ctx, struct g2d_image *src,
struct g2d_image *dst, unsigned int src_x, struct g2d_image *dst, unsigned int src_x,
unsigned int src_y, unsigned int dst_x, unsigned int dst_y, unsigned int src_y, unsigned int dst_x, unsigned int dst_y,
unsigned int w, unsigned int h, enum e_g2d_op op) unsigned int w, unsigned int h, enum e_g2d_op op)