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

amdgpu: compare the primary device names instead 

Instead of taking a look at the device major/minor we
just compare the primary device name to figure out if
two fds are pointing to the same device.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
main
Christian König 2015-04-30 14:13:28 +02:00 committed by Alex Deucher
parent 6dc2eaf2cc
commit c68d58aa14
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
amdgpu/amdgpu_device.c
View File

@ -42,7 +42,6 @@
#define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x))) #define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x)))
#define UINT_TO_PTR(x) ((void *)((intptr_t)(x))) #define UINT_TO_PTR(x) ((void *)((intptr_t)(x)))
#define RENDERNODE_MINOR_MASK 0xff7f
pthread_mutex_t fd_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t fd_mutex = PTHREAD_MUTEX_INITIALIZER;
static struct util_hash_table *fd_tab; static struct util_hash_table *fd_tab;
@ -60,30 +59,40 @@ static int handle_compare(void *key1, void *key2)
static unsigned fd_hash(void *key) static unsigned fd_hash(void *key)
{ {
int fd = PTR_TO_UINT(key); int fd = PTR_TO_UINT(key);
struct stat stat; char *name = drmGetPrimaryDeviceNameFromFd(fd);
fstat(fd, &stat); unsigned result = 0;
char *c;
if (!S_ISCHR(stat.st_mode)) if (name == NULL)
return stat.st_dev ^ stat.st_ino; return 0;
else
return stat.st_dev ^ (stat.st_rdev & RENDERNODE_MINOR_MASK); for (c = name; *c; ++c)
result += *c;
free(name);
return result;
} }
static int fd_compare(void *key1, void *key2) static int fd_compare(void *key1, void *key2)
{ {
int fd1 = PTR_TO_UINT(key1); int fd1 = PTR_TO_UINT(key1);
int fd2 = PTR_TO_UINT(key2); int fd2 = PTR_TO_UINT(key2);
struct stat stat1, stat2; char *name1 = drmGetPrimaryDeviceNameFromFd(fd1);
fstat(fd1, &stat1); char *name2 = drmGetPrimaryDeviceNameFromFd(fd2);
fstat(fd2, &stat2); int result;
if (!S_ISCHR(stat1.st_mode) || !S_ISCHR(stat2.st_mode)) if (name1 == NULL || name2 == NULL) {
return stat1.st_dev != stat2.st_dev || free(name1);
stat1.st_ino != stat2.st_ino; free(name2);
else return 0;
return major(stat1.st_rdev) != major(stat2.st_rdev) || }
(minor(stat1.st_rdev) & RENDERNODE_MINOR_MASK) !=
(minor(stat2.st_rdev) & RENDERNODE_MINOR_MASK); result = strcmp(name1, name2);
free(name1);
free(name2);
return result;
} }
/** /**