fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 21:08:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

etnaviv: Use hash table to track BO indexes

Browse source 
Use hash table instead of ad-hoc arrays.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
This commit is contained in:
Marek Vasut 2019-06-03 19:49:14 +02:00 • committed by Lucas Stach
parent 23f5f126d5
commit cf92074277
3 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,14 +47,14 @@ void _etna_bo_del(struct etna_bo *bo)
if (bo->map)
os_munmap(bo->map, bo->size);
if (bo->name)
_mesa_hash_table_remove_key(bo->dev->name_table, &bo->name);
if (bo->handle) {
struct drm_gem_close req = {
.handle = bo->handle,
};
if (bo->name)
_mesa_hash_table_remove_key(bo->dev->name_table, &bo->name);
_mesa_hash_table_remove_key(bo->dev->handle_table, &bo->handle);
drmIoctl(bo->dev->fd, DRM_IOCTL_GEM_CLOSE, &req);
}

23
src/etnaviv/drm/etnaviv_cmd_stream.c
View file

@ -153,14 +153,20 @@ static uint32_t bo2idx(struct etna_cmd_stream *stream, struct etna_bo *bo,
if (bo->current_stream == stream) {
idx = bo->idx;
} else {
/* slow-path: */
for (idx = 0; idx < priv->nr_bos; idx++)
if (priv->bos[idx] == bo)
break;
if (idx == priv->nr_bos) {
/* not found */
void *val;
if (!priv->bo_table)
priv->bo_table = drmHashCreate();
if (!drmHashLookup(priv->bo_table, bo->handle, &val)) {
/* found */
idx = (uint32_t)(uintptr_t)val;
} else {
idx = append_bo(stream, bo);
val = (void *)(uintptr_t)idx;
drmHashInsert(priv->bo_table, bo->handle, val);
}
bo->current_stream = stream;
bo->idx = idx;
}
@ -217,6 +223,11 @@ static void flush(struct etna_cmd_stream *stream, int in_fence_fd,
etna_bo_del(bo);
}
if (priv->bo_table) {
drmHashDestroy(priv->bo_table);
priv->bo_table = NULL;
}
if (out_fence_fd)
*out_fence_fd = req.fence_fd;
}

12
src/etnaviv/drm/etnaviv_priv.h
View file

@ -99,12 +99,10 @@ struct etna_bo {
uint64_t offset; /* offset to mmap() */
int refcnt;
/* in the common case, a bo won't be referenced by more than a single
* command stream. So to avoid looping over all the bo's in the
* reloc table to find the idx of a bo that might already be in the
* table, we cache the idx in the bo. But in order to detect the
* slow-path where bo is ref'd in multiple streams, we also must track
* the current_stream for which the idx is valid. See bo2idx().
/*
* To avoid excess hashtable lookups, cache the stream this bo was
* last emitted on (since that will probably also be the next ring
* it is emitted on).
*/
struct etna_cmd_stream *current_stream;
uint32_t idx;
@ -154,6 +152,8 @@ struct etna_cmd_stream_priv {
/* notify callback if buffer reset happened */
void (*reset_notify)(struct etna_cmd_stream *stream, void *priv);
void *reset_notify_priv;
void *bo_table;
};
struct etna_perfmon {