geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etnaviv: add API to create etna_device from private dup() fd 

Like etna_device_new() but creates it's own private dup() of the fd
which is close()d when the device is finalized.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
main
Christian Gmeiner 2016-11-13 21:29:22 +01:00
parent a14d6a6a43
commit befb6429f0
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etnaviv/etnaviv-symbol-check
View File

@ -11,6 +11,7 @@ _end
_fini _fini
_init _init
etna_device_new etna_device_new
etna_device_new_dup
etna_device_ref etna_device_ref
etna_device_del etna_device_del
etna_device_fd etna_device_fd

18
etnaviv/etnaviv_device.c
View File

@ -61,6 +61,21 @@ struct etna_device *etna_device_new(int fd)
return dev; return dev;
} }
/* like etna_device_new() but creates it's own private dup() of the fd
* which is close()d when the device is finalized. */
struct etna_device *etna_device_new_dup(int fd)
{
int dup_fd = dup(fd);
struct etna_device *dev = etna_device_new(dup_fd);
if (dev)
dev->closefd = 1;
else
close(dup_fd);
return dev;
}
struct etna_device *etna_device_ref(struct etna_device *dev) struct etna_device *etna_device_ref(struct etna_device *dev)
{ {
atomic_inc(&dev->refcnt); atomic_inc(&dev->refcnt);
@ -74,6 +89,9 @@ static void etna_device_del_impl(struct etna_device *dev)
drmHashDestroy(dev->handle_table); drmHashDestroy(dev->handle_table);
drmHashDestroy(dev->name_table); drmHashDestroy(dev->name_table);
if (dev->closefd)
close(dev->fd);
free(dev); free(dev);
} }

1
etnaviv/etnaviv_drmif.h
View File

@ -84,6 +84,7 @@ enum etna_param_id {
*/ */
struct etna_device *etna_device_new(int fd); struct etna_device *etna_device_new(int fd);
struct etna_device *etna_device_new_dup(int fd);
struct etna_device *etna_device_ref(struct etna_device *dev); struct etna_device *etna_device_ref(struct etna_device *dev);
void etna_device_del(struct etna_device *dev); void etna_device_del(struct etna_device *dev);
int etna_device_fd(struct etna_device *dev); int etna_device_fd(struct etna_device *dev);

2
etnaviv/etnaviv_priv.h
View File

@ -93,6 +93,8 @@ struct etna_device {
void *handle_table, *name_table; void *handle_table, *name_table;
struct etna_bo_cache bo_cache; struct etna_bo_cache bo_cache;
int closefd; /* call close(fd) upon destruction */
}; };
drm_private void etna_bo_cache_init(struct etna_bo_cache *cache); drm_private void etna_bo_cache_init(struct etna_bo_cache *cache);