KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etnaviv: drm: s/bo_del/_etna_bo_del/ 

This avoids a conflict with freedreno's bo_del().

Signed-off-by: Guido Günther <guido.gunther@puri.sm>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
Guido Günther 2019-05-31 14:35:08 +02:00
parent 17d7282cca
commit 95d8b4ac0b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etnaviv/drm/etnaviv_bo.c
View File

@ -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);

4
src/etnaviv/drm/etnaviv_bo_cache.c
View File

@ -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);
}
}