Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Open the device non-blocking 

This is essential to prevent deadlocks when running with ZaphodHeads.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-08-31 00:25:16 +01:00
parent 82dbe3ff81
commit dbf5751b5b
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/intel_device.c
View File

@ -128,6 +128,22 @@ static int fd_set_cloexec(int fd)
return fd;
}
static int fd_set_nonblock(int fd)
{
int flags;
if (fd == -1)
return fd;
flags = fcntl(fd, F_GETFD);
if (flags != -1) {
flags |= O_NONBLOCK;
fcntl(fd, F_SETFD, flags);
}
return fd;
}
static int __intel_open_device(const struct pci_device *pci, char **path)
{
int fd;
@ -158,14 +174,15 @@ static int __intel_open_device(const struct pci_device *pci, char **path)
fd = -1;
}
}
fd = fd_set_nonblock(fd);
} else {
#ifdef O_CLOEXEC
fd = open(*path, O_RDWR | O_CLOEXEC);
fd = open(*path, O_RDWR | O_NONBLOCK | O_CLOEXEC);
#else
fd = -1;
#endif
if (fd == -1)
fd = fd_set_cloexec(open(*path, O_RDWR));
fd = fd_set_cloexec(open(*path, O_RDWR | O_NONBLOCK));
}
return fd;