XLibre/xf86-video-vmware
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-vmware.git synced 2026-03-24 01:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmwgfx: Fix server termination due to a mesa loader bug

Browse Source 
Some versions of the Gallium loader close our drm file descriptor if
xa_tracker_create() fails (typically 2D VMs.) While this is mostly fixed
everywhere, we implement a workaround to avoid tracking down the same bug
again and again on those setups where this is not fixed in mesa.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
This commit is contained in:
Thomas Hellstrom
2018-02-14 08:10:41 +01:00
parent ea77ce3a20
commit 1899b0896d
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
vmwgfx/vmwgfx_driver.c
View File

@@ -34,6 +34,7 @@
#endif
#include <unistd.h>
#include <fcntl.h>
#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -1033,7 +1034,29 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
vmw_ctrl_ext_init(pScrn);
if (ms->accelerate_render) {
/*
* Some versions of the Gallium loader close our drm file
* descriptor if xa_tracker_create() fails (typically 2D VMs.)
* While this is mostly fixed everywhere we implement a
* workaround to avoid tracking down the same bug again and again
* on those setups where this is not fixed in mesa.
*/
int tmp_fd = dup(ms->fd);
long flags = fcntl(ms->fd, F_GETFD);
ms->xat = xa_tracker_create(ms->fd);
if (fcntl(ms->fd, F_GETFD) == -1) {
if (tmp_fd == -1 || flags == -1 || fcntl(tmp_fd, F_SETFD, flags)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"XA closed our DRM file descriptor. Giving up.\n");
return FALSE;
}
ms->fd = tmp_fd;
} else {
close(tmp_fd);
}
if (!ms->xat) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Failed to initialize Gallium3D Xa. "