No changes to exported symbols.
Signed-off-by: Maarten Lankhorst maarten.lankhorst@canonical.com --- omap/Makefile.am | 1 + omap/omap_drm.c | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/omap/Makefile.am b/omap/Makefile.am index c77520b..0778bdd 100644 --- a/omap/Makefile.am +++ b/omap/Makefile.am @@ -1,5 +1,6 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(VISIBILITY_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/omap \ $(PTHREADSTUBS_CFLAGS) \ diff --git a/omap/omap_drm.c b/omap/omap_drm.c index 89f1491..8b4ec46 100644 --- a/omap/omap_drm.c +++ b/omap/omap_drm.c @@ -39,6 +39,7 @@ #include <unistd.h> #include <pthread.h>
+#include <libdrm.h> #include <xf86drm.h> #include <xf86atomic.h>
@@ -91,7 +92,7 @@ static struct omap_device * omap_device_new_impl(int fd) return dev; }
-struct omap_device * omap_device_new(int fd) +drm_public struct omap_device * omap_device_new(int fd) { struct omap_device *dev = NULL;
@@ -114,13 +115,13 @@ struct omap_device * omap_device_new(int fd) return dev; }
-struct omap_device * omap_device_ref(struct omap_device *dev) +drm_public struct omap_device * omap_device_ref(struct omap_device *dev) { atomic_inc(&dev->refcnt); return dev; }
-void omap_device_del(struct omap_device *dev) +drm_public void omap_device_del(struct omap_device *dev) { if (!atomic_dec_and_test(&dev->refcnt)) return; @@ -131,7 +132,8 @@ void omap_device_del(struct omap_device *dev) free(dev); }
-int omap_get_param(struct omap_device *dev, uint64_t param, uint64_t *value) +drm_public int +omap_get_param(struct omap_device *dev, uint64_t param, uint64_t *value) { struct drm_omap_param req = { .param = param, @@ -148,7 +150,8 @@ int omap_get_param(struct omap_device *dev, uint64_t param, uint64_t *value) return 0; }
-int omap_set_param(struct omap_device *dev, uint64_t param, uint64_t value) +drm_public int +omap_set_param(struct omap_device *dev, uint64_t param, uint64_t value) { struct drm_omap_param req = { .param = param, @@ -226,8 +229,8 @@ fail:
/* allocate a new (un-tiled) buffer object */ -struct omap_bo * omap_bo_new(struct omap_device *dev, - uint32_t size, uint32_t flags) +drm_public struct omap_bo * +omap_bo_new(struct omap_device *dev, uint32_t size, uint32_t flags) { union omap_gem_size gsize = { .bytes = size, @@ -239,8 +242,9 @@ struct omap_bo * omap_bo_new(struct omap_device *dev, }
/* allocate a new buffer object */ -struct omap_bo * omap_bo_new_tiled(struct omap_device *dev, - uint32_t width, uint32_t height, uint32_t flags) +drm_public struct omap_bo * +omap_bo_new_tiled(struct omap_device *dev, uint32_t width, + uint32_t height, uint32_t flags) { union omap_gem_size gsize = { .tiled = { @@ -254,7 +258,7 @@ struct omap_bo * omap_bo_new_tiled(struct omap_device *dev, return omap_bo_new_impl(dev, gsize, flags); }
-struct omap_bo * omap_bo_ref(struct omap_bo *bo) +drm_public struct omap_bo *omap_bo_ref(struct omap_bo *bo) { atomic_inc(&bo->refcnt); return bo; @@ -280,7 +284,8 @@ static int get_buffer_info(struct omap_bo *bo) }
/* import a buffer object from DRI2 name */ -struct omap_bo * omap_bo_from_name(struct omap_device *dev, uint32_t name) +drm_public struct omap_bo * +omap_bo_from_name(struct omap_device *dev, uint32_t name) { struct omap_bo *bo = NULL; struct drm_gem_open req = { @@ -313,7 +318,8 @@ fail: * fd so caller should close() the fd when it is otherwise done * with it (even if it is still using the 'struct omap_bo *') */ -struct omap_bo * omap_bo_from_dmabuf(struct omap_device *dev, int fd) +drm_public struct omap_bo * +omap_bo_from_dmabuf(struct omap_device *dev, int fd) { struct omap_bo *bo = NULL; struct drm_prime_handle req = { @@ -344,7 +350,7 @@ fail: }
/* destroy a buffer object */ -void omap_bo_del(struct omap_bo *bo) +drm_public void omap_bo_del(struct omap_bo *bo) { if (!bo) { return; @@ -377,7 +383,7 @@ void omap_bo_del(struct omap_bo *bo) }
/* get the global flink/DRI2 buffer name */ -int omap_bo_get_name(struct omap_bo *bo, uint32_t *name) +drm_public int omap_bo_get_name(struct omap_bo *bo, uint32_t *name) { if (!bo->name) { struct drm_gem_flink req = { @@ -398,7 +404,7 @@ int omap_bo_get_name(struct omap_bo *bo, uint32_t *name) return 0; }
-uint32_t omap_bo_handle(struct omap_bo *bo) +drm_public uint32_t omap_bo_handle(struct omap_bo *bo) { return bo->handle; } @@ -406,7 +412,7 @@ uint32_t omap_bo_handle(struct omap_bo *bo) /* caller owns the dmabuf fd that is returned and is responsible * to close() it when done */ -int omap_bo_dmabuf(struct omap_bo *bo) +drm_public int omap_bo_dmabuf(struct omap_bo *bo) { if (!bo->fd) { struct drm_prime_handle req = { @@ -425,7 +431,7 @@ int omap_bo_dmabuf(struct omap_bo *bo) return dup(bo->fd); }
-uint32_t omap_bo_size(struct omap_bo *bo) +drm_public uint32_t omap_bo_size(struct omap_bo *bo) { if (!bo->size) { get_buffer_info(bo); @@ -433,7 +439,7 @@ uint32_t omap_bo_size(struct omap_bo *bo) return bo->size; }
-void * omap_bo_map(struct omap_bo *bo) +drm_public void *omap_bo_map(struct omap_bo *bo) { if (!bo->map) { if (!bo->offset) { @@ -449,7 +455,7 @@ void * omap_bo_map(struct omap_bo *bo) return bo->map; }
-int omap_bo_cpu_prep(struct omap_bo *bo, enum omap_gem_op op) +drm_public int omap_bo_cpu_prep(struct omap_bo *bo, enum omap_gem_op op) { struct drm_omap_gem_cpu_prep req = { .handle = bo->handle, @@ -459,7 +465,7 @@ int omap_bo_cpu_prep(struct omap_bo *bo, enum omap_gem_op op) DRM_OMAP_GEM_CPU_PREP, &req, sizeof(req)); }
-int omap_bo_cpu_fini(struct omap_bo *bo, enum omap_gem_op op) +drm_public int omap_bo_cpu_fini(struct omap_bo *bo, enum omap_gem_op op) { struct drm_omap_gem_cpu_fini req = { .handle = bo->handle,