radeon: annotate public functions

while read sym; do
	read f func line _ <<<$(cscope -d -L -1 $sym)
	if [ ! -z "$f" ]; then
		sed -i "${line}s/^/drm_public /" $f
	fi
done < /tmp/a.txt

In which /tmp/a.txt contains the public symbols from
radeon-symbol-check. The idea here will be to switch the default
visibility to hidden so we don't export symbols we shouldn't.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
main
Lucas De Marchi 2018-09-13 16:05:15 -07:00
parent f3f7266d94
commit 9f45264815
6 changed files with 41 additions and 41 deletions

View File

@ -33,7 +33,7 @@
#include <radeon_bo.h> #include <radeon_bo.h>
#include <radeon_bo_int.h> #include <radeon_bo_int.h>
void radeon_bo_debug(struct radeon_bo *bo, const char *op) drm_public void radeon_bo_debug(struct radeon_bo *bo, const char *op)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
@ -41,7 +41,7 @@ void radeon_bo_debug(struct radeon_bo *bo, const char *op)
op, bo, bo->handle, boi->size, boi->cref); op, bo, bo->handle, boi->size, boi->cref);
} }
struct radeon_bo * drm_public struct radeon_bo *
radeon_bo_open(struct radeon_bo_manager *bom, uint32_t handle, uint32_t size, radeon_bo_open(struct radeon_bo_manager *bom, uint32_t handle, uint32_t size,
uint32_t alignment, uint32_t domains, uint32_t flags) uint32_t alignment, uint32_t domains, uint32_t flags)
{ {
@ -50,14 +50,14 @@ radeon_bo_open(struct radeon_bo_manager *bom, uint32_t handle, uint32_t size,
return bo; return bo;
} }
void radeon_bo_ref(struct radeon_bo *bo) drm_public void radeon_bo_ref(struct radeon_bo *bo)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
boi->cref++; boi->cref++;
boi->bom->funcs->bo_ref(boi); boi->bom->funcs->bo_ref(boi);
} }
struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo) drm_public struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
if (bo == NULL) if (bo == NULL)
@ -79,7 +79,7 @@ int radeon_bo_unmap(struct radeon_bo *bo)
return boi->bom->funcs->bo_unmap(boi); return boi->bom->funcs->bo_unmap(boi);
} }
int radeon_bo_wait(struct radeon_bo *bo) drm_public int radeon_bo_wait(struct radeon_bo *bo)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
if (!boi->bom->funcs->bo_wait) if (!boi->bom->funcs->bo_wait)
@ -87,13 +87,13 @@ int radeon_bo_wait(struct radeon_bo *bo)
return boi->bom->funcs->bo_wait(boi); return boi->bom->funcs->bo_wait(boi);
} }
int radeon_bo_is_busy(struct radeon_bo *bo, uint32_t *domain) drm_public int radeon_bo_is_busy(struct radeon_bo *bo, uint32_t *domain)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
return boi->bom->funcs->bo_is_busy(boi, domain); return boi->bom->funcs->bo_is_busy(boi, domain);
} }
int drm_public int
radeon_bo_set_tiling(struct radeon_bo *bo, radeon_bo_set_tiling(struct radeon_bo *bo,
uint32_t tiling_flags, uint32_t pitch) uint32_t tiling_flags, uint32_t pitch)
{ {
@ -101,7 +101,7 @@ radeon_bo_set_tiling(struct radeon_bo *bo,
return boi->bom->funcs->bo_set_tiling(boi, tiling_flags, pitch); return boi->bom->funcs->bo_set_tiling(boi, tiling_flags, pitch);
} }
int drm_public int
radeon_bo_get_tiling(struct radeon_bo *bo, radeon_bo_get_tiling(struct radeon_bo *bo,
uint32_t *tiling_flags, uint32_t *pitch) uint32_t *tiling_flags, uint32_t *pitch)
{ {
@ -109,7 +109,7 @@ radeon_bo_get_tiling(struct radeon_bo *bo,
return boi->bom->funcs->bo_get_tiling(boi, tiling_flags, pitch); return boi->bom->funcs->bo_get_tiling(boi, tiling_flags, pitch);
} }
int radeon_bo_is_static(struct radeon_bo *bo) drm_public int radeon_bo_is_static(struct radeon_bo *bo)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
if (boi->bom->funcs->bo_is_static) if (boi->bom->funcs->bo_is_static)
@ -117,19 +117,19 @@ int radeon_bo_is_static(struct radeon_bo *bo)
return 0; return 0;
} }
int drm_public int
radeon_bo_is_referenced_by_cs(struct radeon_bo *bo, struct radeon_cs *cs) radeon_bo_is_referenced_by_cs(struct radeon_bo *bo, struct radeon_cs *cs)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
return boi->cref > 1; return boi->cref > 1;
} }
uint32_t radeon_bo_get_handle(struct radeon_bo *bo) drm_public uint32_t radeon_bo_get_handle(struct radeon_bo *bo)
{ {
return bo->handle; return bo->handle;
} }
uint32_t radeon_bo_get_src_domain(struct radeon_bo *bo) drm_public uint32_t radeon_bo_get_src_domain(struct radeon_bo *bo)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
uint32_t src_domain; uint32_t src_domain;

View File

@ -281,7 +281,7 @@ static const struct radeon_bo_funcs bo_gem_funcs = {
.bo_is_referenced_by_cs = NULL, .bo_is_referenced_by_cs = NULL,
}; };
struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd) drm_public struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
{ {
struct bo_manager_gem *bomg; struct bo_manager_gem *bomg;
@ -294,7 +294,7 @@ struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
return (struct radeon_bo_manager*)bomg; return (struct radeon_bo_manager*)bomg;
} }
void radeon_bo_manager_gem_dtor(struct radeon_bo_manager *bom) drm_public void radeon_bo_manager_gem_dtor(struct radeon_bo_manager *bom)
{ {
struct bo_manager_gem *bomg = (struct bo_manager_gem*)bom; struct bo_manager_gem *bomg = (struct bo_manager_gem*)bom;
@ -304,21 +304,21 @@ void radeon_bo_manager_gem_dtor(struct radeon_bo_manager *bom)
free(bomg); free(bomg);
} }
uint32_t drm_public uint32_t
radeon_gem_name_bo(struct radeon_bo *bo) radeon_gem_name_bo(struct radeon_bo *bo)
{ {
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo; struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
return bo_gem->name; return bo_gem->name;
} }
void * drm_public void *
radeon_gem_get_reloc_in_cs(struct radeon_bo *bo) radeon_gem_get_reloc_in_cs(struct radeon_bo *bo)
{ {
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo; struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
return &bo_gem->reloc_in_cs; return &bo_gem->reloc_in_cs;
} }
int drm_public int
radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name) radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
{ {
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo; struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
@ -340,7 +340,7 @@ radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
return 0; return 0;
} }
int drm_public int
radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t write_domain) radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t write_domain)
{ {
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
@ -358,7 +358,7 @@ radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t writ
return r; return r;
} }
int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle) drm_public int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle)
{ {
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo; struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
int ret; int ret;
@ -367,7 +367,7 @@ int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle)
return ret; return ret;
} }
struct radeon_bo * drm_public struct radeon_bo *
radeon_gem_bo_open_prime(struct radeon_bo_manager *bom, int fd_handle, uint32_t size) radeon_gem_bo_open_prime(struct radeon_bo_manager *bom, int fd_handle, uint32_t size)
{ {
struct radeon_bo_gem *bo; struct radeon_bo_gem *bo;

View File

@ -3,14 +3,14 @@
#include "radeon_cs.h" #include "radeon_cs.h"
#include "radeon_cs_int.h" #include "radeon_cs_int.h"
struct radeon_cs * drm_public struct radeon_cs *
radeon_cs_create(struct radeon_cs_manager *csm, uint32_t ndw) radeon_cs_create(struct radeon_cs_manager *csm, uint32_t ndw)
{ {
struct radeon_cs_int *csi = csm->funcs->cs_create(csm, ndw); struct radeon_cs_int *csi = csm->funcs->cs_create(csm, ndw);
return (struct radeon_cs *)csi; return (struct radeon_cs *)csi;
} }
int drm_public int
radeon_cs_write_reloc(struct radeon_cs *cs, struct radeon_bo *bo, radeon_cs_write_reloc(struct radeon_cs *cs, struct radeon_bo *bo,
uint32_t read_domain, uint32_t write_domain, uint32_t read_domain, uint32_t write_domain,
uint32_t flags) uint32_t flags)
@ -24,7 +24,7 @@ radeon_cs_write_reloc(struct radeon_cs *cs, struct radeon_bo *bo,
flags); flags);
} }
int drm_public int
radeon_cs_begin(struct radeon_cs *cs, uint32_t ndw, radeon_cs_begin(struct radeon_cs *cs, uint32_t ndw,
const char *file, const char *func, int line) const char *file, const char *func, int line)
{ {
@ -32,7 +32,7 @@ radeon_cs_begin(struct radeon_cs *cs, uint32_t ndw,
return csi->csm->funcs->cs_begin(csi, ndw, file, func, line); return csi->csm->funcs->cs_begin(csi, ndw, file, func, line);
} }
int drm_public int
radeon_cs_end(struct radeon_cs *cs, radeon_cs_end(struct radeon_cs *cs,
const char *file, const char *func, int line) const char *file, const char *func, int line)
{ {
@ -40,37 +40,37 @@ radeon_cs_end(struct radeon_cs *cs,
return csi->csm->funcs->cs_end(csi, file, func, line); return csi->csm->funcs->cs_end(csi, file, func, line);
} }
int radeon_cs_emit(struct radeon_cs *cs) drm_public int radeon_cs_emit(struct radeon_cs *cs)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
return csi->csm->funcs->cs_emit(csi); return csi->csm->funcs->cs_emit(csi);
} }
int radeon_cs_destroy(struct radeon_cs *cs) drm_public int radeon_cs_destroy(struct radeon_cs *cs)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
return csi->csm->funcs->cs_destroy(csi); return csi->csm->funcs->cs_destroy(csi);
} }
int radeon_cs_erase(struct radeon_cs *cs) drm_public int radeon_cs_erase(struct radeon_cs *cs)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
return csi->csm->funcs->cs_erase(csi); return csi->csm->funcs->cs_erase(csi);
} }
int radeon_cs_need_flush(struct radeon_cs *cs) drm_public int radeon_cs_need_flush(struct radeon_cs *cs)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
return csi->csm->funcs->cs_need_flush(csi); return csi->csm->funcs->cs_need_flush(csi);
} }
void radeon_cs_print(struct radeon_cs *cs, FILE *file) drm_public void radeon_cs_print(struct radeon_cs *cs, FILE *file)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
csi->csm->funcs->cs_print(csi, file); csi->csm->funcs->cs_print(csi, file);
} }
void drm_public void
radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit) radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
@ -80,7 +80,7 @@ radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
csi->csm->gart_limit = limit; csi->csm->gart_limit = limit;
} }
void radeon_cs_space_set_flush(struct radeon_cs *cs, drm_public void radeon_cs_space_set_flush(struct radeon_cs *cs,
void (*fn)(void *), void *data) void (*fn)(void *), void *data)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
@ -88,7 +88,7 @@ void radeon_cs_space_set_flush(struct radeon_cs *cs,
csi->space_flush_data = data; csi->space_flush_data = data;
} }
uint32_t radeon_cs_get_id(struct radeon_cs *cs) drm_public uint32_t radeon_cs_get_id(struct radeon_cs *cs)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
return csi->id; return csi->id;

View File

@ -536,7 +536,7 @@ static int radeon_get_device_id(int fd, uint32_t *device_id)
return r; return r;
} }
struct radeon_cs_manager *radeon_cs_manager_gem_ctor(int fd) drm_public struct radeon_cs_manager *radeon_cs_manager_gem_ctor(int fd)
{ {
struct radeon_cs_manager_gem *csm; struct radeon_cs_manager_gem *csm;
@ -550,7 +550,7 @@ struct radeon_cs_manager *radeon_cs_manager_gem_ctor(int fd)
return &csm->base; return &csm->base;
} }
void radeon_cs_manager_gem_dtor(struct radeon_cs_manager *csm) drm_public void radeon_cs_manager_gem_dtor(struct radeon_cs_manager *csm)
{ {
free(csm); free(csm);
} }

View File

@ -162,7 +162,7 @@ static int radeon_cs_do_space_check(struct radeon_cs_int *cs, struct radeon_cs_s
return RADEON_CS_SPACE_OK; return RADEON_CS_SPACE_OK;
} }
void drm_public void
radeon_cs_space_add_persistent_bo(struct radeon_cs *cs, struct radeon_bo *bo, radeon_cs_space_add_persistent_bo(struct radeon_cs *cs, struct radeon_bo *bo,
uint32_t read_domains, uint32_t write_domain) uint32_t read_domains, uint32_t write_domain)
{ {
@ -206,7 +206,7 @@ again:
return 0; return 0;
} }
int drm_public int
radeon_cs_space_check_with_bo(struct radeon_cs *cs, struct radeon_bo *bo, radeon_cs_space_check_with_bo(struct radeon_cs *cs, struct radeon_bo *bo,
uint32_t read_domains, uint32_t write_domain) uint32_t read_domains, uint32_t write_domain)
{ {
@ -233,7 +233,7 @@ int radeon_cs_space_check(struct radeon_cs *cs)
return radeon_cs_check_space_internal(csi, NULL); return radeon_cs_check_space_internal(csi, NULL);
} }
void radeon_cs_space_reset_bos(struct radeon_cs *cs) drm_public void radeon_cs_space_reset_bos(struct radeon_cs *cs)
{ {
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs; struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
int i; int i;

View File

@ -2408,7 +2408,7 @@ static int cik_surface_best(struct radeon_surface_manager *surf_man,
/* =========================================================================== /* ===========================================================================
* public API * public API
*/ */
struct radeon_surface_manager * drm_public struct radeon_surface_manager *
radeon_surface_manager_new(int fd) radeon_surface_manager_new(int fd)
{ {
struct radeon_surface_manager *surf_man; struct radeon_surface_manager *surf_man;
@ -2457,7 +2457,7 @@ out_err:
return NULL; return NULL;
} }
void drm_public void
radeon_surface_manager_free(struct radeon_surface_manager *surf_man) radeon_surface_manager_free(struct radeon_surface_manager *surf_man)
{ {
free(surf_man); free(surf_man);
@ -2531,7 +2531,7 @@ static int radeon_surface_sanity(struct radeon_surface_manager *surf_man,
return 0; return 0;
} }
int drm_public int
radeon_surface_init(struct radeon_surface_manager *surf_man, radeon_surface_init(struct radeon_surface_manager *surf_man,
struct radeon_surface *surf) struct radeon_surface *surf)
{ {
@ -2548,7 +2548,7 @@ radeon_surface_init(struct radeon_surface_manager *surf_man,
return surf_man->surface_init(surf_man, surf); return surf_man->surface_init(surf_man, surf);
} }
int drm_public int
radeon_surface_best(struct radeon_surface_manager *surf_man, radeon_surface_best(struct radeon_surface_manager *surf_man,
struct radeon_surface *surf) struct radeon_surface *surf)
{ {