diff options
author | Emil Velikov | 2015-03-31 16:32:11 -0500 |
---|---|---|
committer | Emil Velikov | 2015-04-28 05:19:15 -0500 |
commit | 0f8da82500ec542e269092c0718479e25eaff5f6 (patch) | |
tree | 4bfdf0fe56674bd42926f6f4607331d1468d08dd /radeon/radeon_bo.c | |
parent | 104c895f650cac7741c12e10ee78bb2fca2cbd49 (diff) | |
download | external-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 'radeon/radeon_bo.c')
-rw-r--r-- | radeon/radeon_bo.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/radeon/radeon_bo.c b/radeon/radeon_bo.c index 02a2d83d..447f9280 100644 --- a/radeon/radeon_bo.c +++ b/radeon/radeon_bo.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <radeon_bo.h> | 36 | #include <radeon_bo.h> |
37 | #include <radeon_bo_int.h> | 37 | #include <radeon_bo_int.h> |
38 | 38 | ||
39 | drm_public void radeon_bo_debug(struct radeon_bo *bo, const char *op) | 39 | void radeon_bo_debug(struct radeon_bo *bo, const char *op) |
40 | { | 40 | { |
41 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 41 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
42 | 42 | ||
@@ -44,7 +44,7 @@ drm_public void radeon_bo_debug(struct radeon_bo *bo, const char *op) | |||
44 | op, bo, bo->handle, boi->size, boi->cref); | 44 | op, bo, bo->handle, boi->size, boi->cref); |
45 | } | 45 | } |
46 | 46 | ||
47 | drm_public struct radeon_bo * | 47 | struct radeon_bo * |
48 | radeon_bo_open(struct radeon_bo_manager *bom, uint32_t handle, uint32_t size, | 48 | radeon_bo_open(struct radeon_bo_manager *bom, uint32_t handle, uint32_t size, |
49 | uint32_t alignment, uint32_t domains, uint32_t flags) | 49 | uint32_t alignment, uint32_t domains, uint32_t flags) |
50 | { | 50 | { |
@@ -53,14 +53,14 @@ radeon_bo_open(struct radeon_bo_manager *bom, uint32_t handle, uint32_t size, | |||
53 | return bo; | 53 | return bo; |
54 | } | 54 | } |
55 | 55 | ||
56 | drm_public void radeon_bo_ref(struct radeon_bo *bo) | 56 | void radeon_bo_ref(struct radeon_bo *bo) |
57 | { | 57 | { |
58 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 58 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
59 | boi->cref++; | 59 | boi->cref++; |
60 | boi->bom->funcs->bo_ref(boi); | 60 | boi->bom->funcs->bo_ref(boi); |
61 | } | 61 | } |
62 | 62 | ||
63 | drm_public struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo) | 63 | struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo) |
64 | { | 64 | { |
65 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 65 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
66 | if (bo == NULL) | 66 | if (bo == NULL) |
@@ -70,19 +70,19 @@ drm_public struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo) | |||
70 | return boi->bom->funcs->bo_unref(boi); | 70 | return boi->bom->funcs->bo_unref(boi); |
71 | } | 71 | } |
72 | 72 | ||
73 | drm_public int radeon_bo_map(struct radeon_bo *bo, int write) | 73 | int radeon_bo_map(struct radeon_bo *bo, int write) |
74 | { | 74 | { |
75 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 75 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
76 | return boi->bom->funcs->bo_map(boi, write); | 76 | return boi->bom->funcs->bo_map(boi, write); |
77 | } | 77 | } |
78 | 78 | ||
79 | drm_public int radeon_bo_unmap(struct radeon_bo *bo) | 79 | int radeon_bo_unmap(struct radeon_bo *bo) |
80 | { | 80 | { |
81 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 81 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
82 | return boi->bom->funcs->bo_unmap(boi); | 82 | return boi->bom->funcs->bo_unmap(boi); |
83 | } | 83 | } |
84 | 84 | ||
85 | drm_public int radeon_bo_wait(struct radeon_bo *bo) | 85 | int radeon_bo_wait(struct radeon_bo *bo) |
86 | { | 86 | { |
87 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 87 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
88 | if (!boi->bom->funcs->bo_wait) | 88 | if (!boi->bom->funcs->bo_wait) |
@@ -90,13 +90,13 @@ drm_public int radeon_bo_wait(struct radeon_bo *bo) | |||
90 | return boi->bom->funcs->bo_wait(boi); | 90 | return boi->bom->funcs->bo_wait(boi); |
91 | } | 91 | } |
92 | 92 | ||
93 | drm_public int radeon_bo_is_busy(struct radeon_bo *bo, uint32_t *domain) | 93 | int radeon_bo_is_busy(struct radeon_bo *bo, uint32_t *domain) |
94 | { | 94 | { |
95 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 95 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
96 | return boi->bom->funcs->bo_is_busy(boi, domain); | 96 | return boi->bom->funcs->bo_is_busy(boi, domain); |
97 | } | 97 | } |
98 | 98 | ||
99 | drm_public int | 99 | int |
100 | radeon_bo_set_tiling(struct radeon_bo *bo, | 100 | radeon_bo_set_tiling(struct radeon_bo *bo, |
101 | uint32_t tiling_flags, uint32_t pitch) | 101 | uint32_t tiling_flags, uint32_t pitch) |
102 | { | 102 | { |
@@ -104,7 +104,7 @@ radeon_bo_set_tiling(struct radeon_bo *bo, | |||
104 | return boi->bom->funcs->bo_set_tiling(boi, tiling_flags, pitch); | 104 | return boi->bom->funcs->bo_set_tiling(boi, tiling_flags, pitch); |
105 | } | 105 | } |
106 | 106 | ||
107 | drm_public int | 107 | int |
108 | radeon_bo_get_tiling(struct radeon_bo *bo, | 108 | radeon_bo_get_tiling(struct radeon_bo *bo, |
109 | uint32_t *tiling_flags, uint32_t *pitch) | 109 | uint32_t *tiling_flags, uint32_t *pitch) |
110 | { | 110 | { |
@@ -112,7 +112,7 @@ radeon_bo_get_tiling(struct radeon_bo *bo, | |||
112 | return boi->bom->funcs->bo_get_tiling(boi, tiling_flags, pitch); | 112 | return boi->bom->funcs->bo_get_tiling(boi, tiling_flags, pitch); |
113 | } | 113 | } |
114 | 114 | ||
115 | drm_public int radeon_bo_is_static(struct radeon_bo *bo) | 115 | int radeon_bo_is_static(struct radeon_bo *bo) |
116 | { | 116 | { |
117 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 117 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
118 | if (boi->bom->funcs->bo_is_static) | 118 | if (boi->bom->funcs->bo_is_static) |
@@ -120,19 +120,19 @@ drm_public int radeon_bo_is_static(struct radeon_bo *bo) | |||
120 | return 0; | 120 | return 0; |
121 | } | 121 | } |
122 | 122 | ||
123 | drm_public int | 123 | int |
124 | radeon_bo_is_referenced_by_cs(struct radeon_bo *bo, struct radeon_cs *cs) | 124 | radeon_bo_is_referenced_by_cs(struct radeon_bo *bo, struct radeon_cs *cs) |
125 | { | 125 | { |
126 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 126 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
127 | return boi->cref > 1; | 127 | return boi->cref > 1; |
128 | } | 128 | } |
129 | 129 | ||
130 | drm_public uint32_t radeon_bo_get_handle(struct radeon_bo *bo) | 130 | uint32_t radeon_bo_get_handle(struct radeon_bo *bo) |
131 | { | 131 | { |
132 | return bo->handle; | 132 | return bo->handle; |
133 | } | 133 | } |
134 | 134 | ||
135 | drm_public uint32_t radeon_bo_get_src_domain(struct radeon_bo *bo) | 135 | uint32_t radeon_bo_get_src_domain(struct radeon_bo *bo) |
136 | { | 136 | { |
137 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; | 137 | struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; |
138 | uint32_t src_domain; | 138 | uint32_t src_domain; |