etnaviv: drm: Drop drm_{public,private}

[mesa.git] / src / etnaviv / drm / etnaviv_bo.c

diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index 43ce6b4e3c9fd6a8aad68a85081d5b4f6cce3c95..be88241d61b70fae33aeba7832a37a61c3de2a7e 100644 (file)
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -27,8 +27,8 @@
 #include "etnaviv_priv.h"
 #include "etnaviv_drmif.h"
 
-drm_private pthread_mutex_t table_lock = PTHREAD_MUTEX_INITIALIZER;
-drm_private void bo_del(struct etna_bo *bo);
+pthread_mutex_t table_lock = PTHREAD_MUTEX_INITIALIZER;
+void bo_del(struct etna_bo *bo);
 
 /* set buffer name, and add to table, call w/ table_lock held: */
 static void set_name(struct etna_bo *bo, uint32_t name)
@@ -39,7 +39,7 @@ static void set_name(struct etna_bo *bo, uint32_t name)
 }
 
 /* Called under table_lock */
-drm_private void bo_del(struct etna_bo *bo)
+void bo_del(struct etna_bo *bo)
 {
        if (bo->map)
                drm_munmap(bo->map, bo->size);
@@ -104,7 +104,7 @@ static struct etna_bo *bo_from_handle(struct etna_device *dev,
 }
 
 /* allocate a new (un-tiled) buffer object */
-drm_public struct etna_bo *etna_bo_new(struct etna_device *dev, uint32_t size,
+struct etna_bo *etna_bo_new(struct etna_device *dev, uint32_t size,
                uint32_t flags)
 {
        struct etna_bo *bo;
@@ -131,7 +131,7 @@ drm_public struct etna_bo *etna_bo_new(struct etna_device *dev, uint32_t size,
        return bo;
 }
 
-drm_public struct etna_bo *etna_bo_ref(struct etna_bo *bo)
+struct etna_bo *etna_bo_ref(struct etna_bo *bo)
 {
        atomic_inc(&bo->refcnt);
 
@@ -159,7 +159,7 @@ static int get_buffer_info(struct etna_bo *bo)
 }
 
 /* import a buffer object from DRI2 name */
-drm_public struct etna_bo *etna_bo_from_name(struct etna_device *dev,
+struct etna_bo *etna_bo_from_name(struct etna_device *dev,
                uint32_t name)
 {
        struct etna_bo *bo;
@@ -197,7 +197,7 @@ out_unlock:
  * fd so caller should close() the fd when it is otherwise done
  * with it (even if it is still using the 'struct etna_bo *')
  */
-drm_public struct etna_bo *etna_bo_from_dmabuf(struct etna_device *dev, int fd)
+struct etna_bo *etna_bo_from_dmabuf(struct etna_device *dev, int fd)
 {
        struct etna_bo *bo;
        int ret, size;
@@ -232,7 +232,7 @@ out_unlock:
 }
 
 /* destroy a buffer object */
-drm_public void etna_bo_del(struct etna_bo *bo)
+void etna_bo_del(struct etna_bo *bo)
 {
        struct etna_device *dev = bo->dev;
 
@@ -254,7 +254,7 @@ out:
 }
 
 /* get the global flink/DRI2 buffer name */
-drm_public int etna_bo_get_name(struct etna_bo *bo, uint32_t *name)
+int etna_bo_get_name(struct etna_bo *bo, uint32_t *name)
 {
        if (!bo->name) {
                struct drm_gem_flink req = {
@@ -278,7 +278,7 @@ drm_public int etna_bo_get_name(struct etna_bo *bo, uint32_t *name)
        return 0;
 }
 
-drm_public uint32_t etna_bo_handle(struct etna_bo *bo)
+uint32_t etna_bo_handle(struct etna_bo *bo)
 {
        return bo->handle;
 }
@@ -286,7 +286,7 @@ drm_public uint32_t etna_bo_handle(struct etna_bo *bo)
 /* caller owns the dmabuf fd that is returned and is responsible
  * to close() it when done
  */
-drm_public int etna_bo_dmabuf(struct etna_bo *bo)
+int etna_bo_dmabuf(struct etna_bo *bo)
 {
        int ret, prime_fd;
 
@@ -302,12 +302,12 @@ drm_public int etna_bo_dmabuf(struct etna_bo *bo)
        return prime_fd;
 }
 
-drm_public uint32_t etna_bo_size(struct etna_bo *bo)
+uint32_t etna_bo_size(struct etna_bo *bo)
 {
        return bo->size;
 }
 
-drm_public void *etna_bo_map(struct etna_bo *bo)
+void *etna_bo_map(struct etna_bo *bo)
 {
        if (!bo->map) {
                if (!bo->offset) {
@@ -325,7 +325,7 @@ drm_public void *etna_bo_map(struct etna_bo *bo)
        return bo->map;
 }
 
-drm_public int etna_bo_cpu_prep(struct etna_bo *bo, uint32_t op)
+int etna_bo_cpu_prep(struct etna_bo *bo, uint32_t op)
 {
        struct drm_etnaviv_gem_cpu_prep req = {
                .handle = bo->handle,
@@ -338,7 +338,7 @@ drm_public int etna_bo_cpu_prep(struct etna_bo *bo, uint32_t op)
                        &req, sizeof(req));
 }
 
-drm_public void etna_bo_cpu_fini(struct etna_bo *bo)
+void etna_bo_cpu_fini(struct etna_bo *bo)
 {
        struct drm_etnaviv_gem_cpu_fini req = {
                .handle = bo->handle,