aboutsummaryrefslogtreecommitdiffstats
path: root/radeon
diff options
context:
space:
mode:
authorEmil Velikov2015-08-15 11:12:13 -0500
committerEmil Velikov2015-09-04 15:39:06 -0500
commitec2b105492cae093cc78003239e9b6816d1a7384 (patch)
treeeb6c542a1467f75e40c7b4320cea893705cb138e /radeon
parentaecd5a1879b39bc2b9b46a0a217aa4ce3d97bc8c (diff)
downloadexternal-libdrm-ec2b105492cae093cc78003239e9b6816d1a7384.tar.gz
external-libdrm-ec2b105492cae093cc78003239e9b6816d1a7384.tar.xz
external-libdrm-ec2b105492cae093cc78003239e9b6816d1a7384.zip
radeon: cleanup bo/cs func tables
Annotate the data as static const and use C99 designated initializers. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'radeon')
-rw-r--r--radeon/radeon_bo_gem.c23
-rw-r--r--radeon/radeon_bo_int.h2
-rw-r--r--radeon/radeon_cs_gem.c20
-rw-r--r--radeon/radeon_cs_int.h2
4 files changed, 24 insertions, 23 deletions
diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index 7fdd437a..c9fe19ff 100644
--- a/radeon/radeon_bo_gem.c
+++ b/radeon/radeon_bo_gem.c
@@ -270,17 +270,18 @@ static int bo_get_tiling(struct radeon_bo_int *boi, uint32_t *tiling_flags,
270 return r; 270 return r;
271} 271}
272 272
273static struct radeon_bo_funcs bo_gem_funcs = { 273static const struct radeon_bo_funcs bo_gem_funcs = {
274 bo_open, 274 .bo_open = bo_open,
275 bo_ref, 275 .bo_ref = bo_ref,
276 bo_unref, 276 .bo_unref = bo_unref,
277 bo_map, 277 .bo_map = bo_map,
278 bo_unmap, 278 .bo_unmap = bo_unmap,
279 bo_wait, 279 .bo_wait = bo_wait,
280 NULL, 280 .bo_is_static = NULL,
281 bo_set_tiling, 281 .bo_set_tiling = bo_set_tiling,
282 bo_get_tiling, 282 .bo_get_tiling = bo_get_tiling,
283 bo_is_busy, 283 .bo_is_busy = bo_is_busy,
284 .bo_is_referenced_by_cs = NULL,
284}; 285};
285 286
286struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd) 287struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
diff --git a/radeon/radeon_bo_int.h b/radeon/radeon_bo_int.h
index 9589ead1..de981b0a 100644
--- a/radeon/radeon_bo_int.h
+++ b/radeon/radeon_bo_int.h
@@ -2,7 +2,7 @@
2#define RADEON_BO_INT 2#define RADEON_BO_INT
3 3
4struct radeon_bo_manager { 4struct radeon_bo_manager {
5 struct radeon_bo_funcs *funcs; 5 const struct radeon_bo_funcs *funcs;
6 int fd; 6 int fd;
7}; 7};
8 8
diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 1962e915..cdec64e0 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -514,16 +514,16 @@ static void cs_gem_print(struct radeon_cs_int *cs, FILE *file)
514 } 514 }
515} 515}
516 516
517static struct radeon_cs_funcs radeon_cs_gem_funcs = { 517static const struct radeon_cs_funcs radeon_cs_gem_funcs = {
518 cs_gem_create, 518 .cs_create = cs_gem_create,
519 cs_gem_write_reloc, 519 .cs_write_reloc = cs_gem_write_reloc,
520 cs_gem_begin, 520 .cs_begin = cs_gem_begin,
521 cs_gem_end, 521 .cs_end = cs_gem_end,
522 cs_gem_emit, 522 .cs_emit = cs_gem_emit,
523 cs_gem_destroy, 523 .cs_destroy = cs_gem_destroy,
524 cs_gem_erase, 524 .cs_erase = cs_gem_erase,
525 cs_gem_need_flush, 525 .cs_need_flush = cs_gem_need_flush,
526 cs_gem_print, 526 .cs_print = cs_gem_print,
527}; 527};
528 528
529static int radeon_get_device_id(int fd, uint32_t *device_id) 529static int radeon_get_device_id(int fd, uint32_t *device_id)
diff --git a/radeon/radeon_cs_int.h b/radeon/radeon_cs_int.h
index 6cee5742..d906ad43 100644
--- a/radeon/radeon_cs_int.h
+++ b/radeon/radeon_cs_int.h
@@ -58,7 +58,7 @@ struct radeon_cs_funcs {
58}; 58};
59 59
60struct radeon_cs_manager { 60struct radeon_cs_manager {
61 struct radeon_cs_funcs *funcs; 61 const struct radeon_cs_funcs *funcs;
62 int fd; 62 int fd;
63 int32_t vram_limit, gart_limit; 63 int32_t vram_limit, gart_limit;
64 int32_t vram_write_used, gart_write_used; 64 int32_t vram_write_used, gart_write_used;