OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dri2: Open the fd before loading the driver.

Browse Source 
I want to stop trusting the server for the driver name, and instead decide
on our own based on the fd, so I needed this code motion.

Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Eric Anholt
2014-01-23 10:17:11 -08:00
parent 378e7ad26f
commit be7a6976a8
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/glx/dri2_glx.c
View File

@@ -1179,6 +1179,20 @@ dri2CreateScreen(int screen, struct glx_display * priv)
return NULL; return NULL;
} }
#ifdef O_CLOEXEC
psc->fd = open(deviceName, O_RDWR | O_CLOEXEC);
if (psc->fd == -1 && errno == EINVAL)
#endif
{
psc->fd = open(deviceName, O_RDWR);
if (psc->fd != -1)
fcntl(psc->fd, F_SETFD, fcntl(psc->fd, F_GETFD) | FD_CLOEXEC);
}
if (psc->fd < 0) {
ErrorMessageF("failed to open drm device: %s\n", strerror(errno));
goto handle_error;
}
psc->driver = driOpenDriver(driverName); psc->driver = driOpenDriver(driverName);
if (psc->driver == NULL) { if (psc->driver == NULL) {
ErrorMessageF("driver pointer missing\n"); ErrorMessageF("driver pointer missing\n");
@@ -1201,20 +1215,6 @@ dri2CreateScreen(int screen, struct glx_display * priv)
goto handle_error; goto handle_error;
} }
#ifdef O_CLOEXEC
psc->fd = open(deviceName, O_RDWR | O_CLOEXEC);
if (psc->fd == -1 && errno == EINVAL)
#endif
{
psc->fd = open(deviceName, O_RDWR);
if (psc->fd != -1)
fcntl(psc->fd, F_SETFD, fcntl(psc->fd, F_GETFD) | FD_CLOEXEC);
}
if (psc->fd < 0) {
ErrorMessageF("failed to open drm device: %s\n", strerror(errno));
goto handle_error;
}
if (drmGetMagic(psc->fd, &magic)) { if (drmGetMagic(psc->fd, &magic)) {
ErrorMessageF("failed to get magic\n"); ErrorMessageF("failed to get magic\n");
goto handle_error; goto handle_error;