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

freedreno: simplify device creation 

Signed-off-by: Rob Clark <robclark@freedesktop.org>
main
Rob Clark 2014-02-28 09:24:39 -05:00
parent 1d86869da6
commit 5a3324638b
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
freedreno/freedreno_device.c
View File

@ -34,7 +34,6 @@
#include "freedreno_priv.h" #include "freedreno_priv.h"
static pthread_mutex_t table_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t table_lock = PTHREAD_MUTEX_INITIALIZER;
static void * dev_table;
struct fd_device * kgsl_device_new(int fd); struct fd_device * kgsl_device_new(int fd);
struct fd_device * msm_device_new(int fd); struct fd_device * msm_device_new(int fd);
@ -77,7 +76,7 @@ init_cache_buckets(struct fd_device *dev)
} }
} }
static struct fd_device * fd_device_new_impl(int fd) struct fd_device * fd_device_new(int fd)
{ {
struct fd_device *dev; struct fd_device *dev;
drmVersionPtr version; drmVersionPtr version;
@ -112,29 +111,6 @@ static struct fd_device * fd_device_new_impl(int fd)
return dev; return dev;
} }
struct fd_device * fd_device_new(int fd)
{
struct fd_device *dev = NULL;
int key = fd;
pthread_mutex_lock(&table_lock);
if (!dev_table)
dev_table = drmHashCreate();
if (drmHashLookup(dev_table, key, (void **)&dev)) {
dev = fd_device_new_impl(fd);
if (dev)
drmHashInsert(dev_table, key, dev);
} else {
dev = fd_device_ref(dev);
}
pthread_mutex_unlock(&table_lock);
return dev;
}
/* like fd_device_new() but creates it's own private dup() of the fd /* like fd_device_new() but creates it's own private dup() of the fd
* which is close()d when the device is finalized. * which is close()d when the device is finalized.
*/ */
@ -156,7 +132,6 @@ static void fd_device_del_impl(struct fd_device *dev)
fd_cleanup_bo_cache(dev, 0); fd_cleanup_bo_cache(dev, 0);
drmHashDestroy(dev->handle_table); drmHashDestroy(dev->handle_table);
drmHashDestroy(dev->name_table); drmHashDestroy(dev->name_table);
drmHashDelete(dev_table, dev->fd);
if (dev->closefd) if (dev->closefd)
close(dev->fd); close(dev->fd);
dev->funcs->destroy(dev); dev->funcs->destroy(dev);

1
freedreno/kgsl/kgsl_bo.c
View File

@ -222,7 +222,6 @@ fail:
return NULL; return NULL;
} }
uint32_t kgsl_bo_gpuaddr(struct kgsl_bo *kgsl_bo, uint32_t offset) uint32_t kgsl_bo_gpuaddr(struct kgsl_bo *kgsl_bo, uint32_t offset)
{ {
struct fd_bo *bo = &kgsl_bo->base; struct fd_bo *bo = &kgsl_bo->base;