fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/xa: Don't close the drm fd on failure v2

Browse source 
If XA fails to initialize with pipe_loader enabled, the pipe_loader's
cleanup function will close the drm file descriptor. That's pretty bad
because the file descriptor will probably be the X server driver's only
connection to drm. Temporarily solve this by dup()'ing the file descriptor
before handing it over to the pipe loader.

This fixes freedesktop.org bugzilla bug #80645.

v2: Fix CC addresses.

Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
This commit is contained in:
Thomas Hellstrom 2014-07-03 02:07:36 -07:00
parent 370184e813
commit 35cf3831d7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/state_trackers/xa/xa_tracker.c
View file

@ -26,6 +26,7 @@
* Thomas Hellstrom <thellstrom-at-vmware-dot-com>
*/
#include <unistd.h>
#include "xa_tracker.h"
#include "xa_priv.h"
#include "pipe/p_state.h"
@ -140,6 +141,7 @@ xa_tracker_create(int drm_fd)
struct xa_tracker *xa = calloc(1, sizeof(struct xa_tracker));
enum xa_surface_type stype;
unsigned int num_formats;
int loader_fd;
if (!xa)
return NULL;
@ -147,7 +149,10 @@ xa_tracker_create(int drm_fd)
#if GALLIUM_STATIC_TARGETS
xa->screen = dd_create_screen(drm_fd);
#else
if (pipe_loader_drm_probe_fd(&xa->dev, drm_fd, false))
loader_fd = dup(drm_fd);
if (loader_fd == -1)
return NULL;
if (pipe_loader_drm_probe_fd(&xa->dev, loader_fd, false))
xa->screen = pipe_loader_create_screen(xa->dev, PIPE_SEARCH_DIR);
#endif
if (!xa->screen)