summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
17d7282)
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>
#include "etnaviv_drmif.h"
pthread_mutex_t etna_drm_table_lock = PTHREAD_MUTEX_INITIALIZER;
#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)
/* 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)
}
/* Called under etna_drm_table_lock */
}
/* 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);
{
if (bo->map)
os_munmap(bo->map, bo->size);
if (bo->reuse && (etna_bo_cache_free(&dev->bo_cache, bo) == 0))
goto out;
if (bo->reuse && (etna_bo_cache_free(&dev->bo_cache, bo) == 0))
goto out;
etna_device_del_locked(dev);
out:
pthread_mutex_unlock(&etna_drm_table_lock);
etna_device_del_locked(dev);
out:
pthread_mutex_unlock(&etna_drm_table_lock);
#include "etnaviv_priv.h"
#include "etnaviv_drmif.h"
#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)
extern pthread_mutex_t etna_drm_table_lock;
static void add_bucket(struct etna_bo_cache *cache, int size)
break;
list_del(&bo->list);
break;
list_del(&bo->list);