Module: Mesa Branch: master Commit: 95d8b4ac0bbef31aa99e21ee6ce18eb09c05d934 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95d8b4ac0bbef31aa99e21ee6ce18eb09c05d934
Author: Guido Günther <[email protected]> Date: Fri May 31 14:35:08 2019 +0200 etnaviv: drm: s/bo_del/_etna_bo_del/ This avoids a conflict with freedreno's bo_del(). Signed-off-by: Guido Günther <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> --- src/etnaviv/drm/etnaviv_bo.c | 6 +++--- src/etnaviv/drm/etnaviv_bo_cache.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c index 6d6339aff49..6e952fa4785 100644 --- a/src/etnaviv/drm/etnaviv_bo.c +++ b/src/etnaviv/drm/etnaviv_bo.c @@ -31,7 +31,7 @@ #include "etnaviv_drmif.h" pthread_mutex_t etna_drm_table_lock = PTHREAD_MUTEX_INITIALIZER; -void bo_del(struct etna_bo *bo); +void _etna_bo_del(struct etna_bo *bo); /* set buffer name, and add to table, call w/ etna_drm_table_lock held: */ static void set_name(struct etna_bo *bo, uint32_t name) @@ -42,7 +42,7 @@ static void set_name(struct etna_bo *bo, uint32_t name) } /* Called under etna_drm_table_lock */ -void bo_del(struct etna_bo *bo) +void _etna_bo_del(struct etna_bo *bo) { if (bo->map) os_munmap(bo->map, bo->size); @@ -251,7 +251,7 @@ void etna_bo_del(struct etna_bo *bo) if (bo->reuse && (etna_bo_cache_free(&dev->bo_cache, bo) == 0)) goto out; - bo_del(bo); + _etna_bo_del(bo); etna_device_del_locked(dev); out: pthread_mutex_unlock(&etna_drm_table_lock); diff --git a/src/etnaviv/drm/etnaviv_bo_cache.c b/src/etnaviv/drm/etnaviv_bo_cache.c index 116013cb2f1..918d00d4e1d 100644 --- a/src/etnaviv/drm/etnaviv_bo_cache.c +++ b/src/etnaviv/drm/etnaviv_bo_cache.c @@ -27,7 +27,7 @@ #include "etnaviv_priv.h" #include "etnaviv_drmif.h" -void bo_del(struct etna_bo *bo); +void _etna_bo_del(struct etna_bo *bo); extern pthread_mutex_t etna_drm_table_lock; static void add_bucket(struct etna_bo_cache *cache, int size) @@ -86,7 +86,7 @@ void etna_bo_cache_cleanup(struct etna_bo_cache *cache, time_t time) break; list_del(&bo->list); - bo_del(bo); + _etna_bo_del(bo); } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
