frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

__glXDRIscreenProbe: Use drmOpen/CloseOnce. 

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9275 . Based on patch from
Alan Swanson.
This commit is contained in:
Michel Dänzer 2007-01-19 17:54:03 +01:00
parent 8b3a591cd3
commit 65f4690ecb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GL/glx/glxdri.c
View File

@ -864,6 +864,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
int api_ver = COPY_SUB_BUFFER_INTERNAL_VERSION; int api_ver = COPY_SUB_BUFFER_INTERNAL_VERSION;
drm_magic_t magic; drm_magic_t magic;
drmVersionPtr version; drmVersionPtr version;
int newlyopened;
char *driverName; char *driverName;
drm_handle_t hFB; drm_handle_t hFB;
int junk; int junk;
@ -914,10 +915,10 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
goto handle_error; goto handle_error;
} }
fd = drmOpen(NULL, BusID); fd = drmOpenOnce(NULL, BusID, &newlyopened);
if (fd < 0) { if (fd < 0) {
LogMessage(X_ERROR, "AIGLX error: drmOpen failed (%s)\n", LogMessage(X_ERROR, "AIGLX error: drmOpenOnce failed (%s)\n",
strerror(-fd)); strerror(-fd));
goto handle_error; goto handle_error;
} }
@ -940,7 +941,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
drm_version.patch = -1; drm_version.patch = -1;
} }
if (!DRIAuthConnection(pScreen, magic)) { if (newlyopened && !DRIAuthConnection(pScreen, magic)) {
LogMessage(X_ERROR, "AIGLX error: DRIAuthConnection failed\n"); LogMessage(X_ERROR, "AIGLX error: DRIAuthConnection failed\n");
goto handle_error; goto handle_error;
} }
@ -1082,7 +1083,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
xfree(dev_priv); xfree(dev_priv);
if (fd >= 0) if (fd >= 0)
drmClose(fd); drmCloseOnce(fd);
DRICloseConnection(pScreen); DRICloseConnection(pScreen);